refactor: add description to errors

Author: MarcosNicolau

aggregation_mode/src/backend/fetcher.rs

@@ -17,8 +17,8 @@ use tracing::{error, info};
 
 #[derive(Debug)]
 pub enum ProofsFetcherError {
-    QueryingLogs,
-    BlockNumber,
+    GetLogs(String),
+    GetBlockNumber(String),
 }
 
 pub struct ProofsFetcher {
@@ -59,7 +59,7 @@ impl ProofsFetcher {
             .from_block(from_block)
             .query()
             .await
-            .map_err(|_| ProofsFetcherError::QueryingLogs)?;
+            .map_err(|e| ProofsFetcherError::GetLogs(e.to_string()))?;
 
         info!("Logs collected {}", logs.len());
 
@@ -124,7 +124,7 @@ impl ProofsFetcher {
             .rpc_provider
             .get_block_number()
             .await
-            .map_err(|_| ProofsFetcherError::BlockNumber)?;
+            .map_err(|e| ProofsFetcherError::GetBlockNumber(e.to_string()))?;
 
         let number_of_blocks_in_the_past = self.fetch_from_secs_ago / self.block_time_secs;
 

aggregation_mode/src/backend/s3.rs

@@ -2,11 +2,11 @@ use aligned_sdk::core::types::VerificationData;
 
 #[derive(Debug)]
 pub enum GetBatchProofsError {
-    Fetching,
-    Deserialization,
-    EmptyBody,
-    StatusFailed,
-    ReqwestClientFailed,
+    FetchingS3Batch(String),
+    Deserialization(String),
+    EmptyBody(String),
+    StatusFailed(String),
+    ReqwestClientFailed((u16, String)),
 }
 
 // needed to make S3 bucket work
@@ -18,25 +18,28 @@ pub async fn get_aligned_batch_from_s3(
     let client = reqwest::Client::builder()
         .user_agent(DEFAULT_USER_AGENT)
         .build()
-        .map_err(|_| GetBatchProofsError::ReqwestClientFailed)?;
+        .map_err(|e| GetBatchProofsError::ReqwestClientFailed(e.to_string()))?;
 
     let response = client
         .get(url)
         .send()
         .await
-        .map_err(|_| GetBatchProofsError::Fetching)?;
+        .map_err(|e| GetBatchProofsError::FetchingS3Batch(e.to_string()))?;
     if !response.status().is_success() {
-        return Err(GetBatchProofsError::StatusFailed);
+        return Err(GetBatchProofsError::StatusFailed((
+            response.status().as_u16(),
+            response.status().canonical_reason(),
+        )));
     }
 
     let bytes = response
         .bytes()
         .await
-        .map_err(|_| GetBatchProofsError::EmptyBody)?;
+        .map_err(|e| GetBatchProofsError::EmptyBody(e.to_string()))?;
     let bytes: &[u8] = bytes.iter().as_slice();
 
-    let data: Vec<VerificationData> =
-        ciborium::from_reader(bytes).map_err(|_| GetBatchProofsError::Deserialization)?;
+    let data: Vec<VerificationData> = ciborium::from_reader(bytes)
+        .map_err(|e| GetBatchProofsError::Deserialization(e.to_string()))?;
 
     Ok(data)
 }