Restore format_merkle_path func to do only one thing

Author: maximopalopoli

aggregation_mode/batcher/src/server/helpers.rs

@@ -1,41 +1,14 @@
-use crate::{db::Receipt, server::types::GetReceiptsResponse};
+pub(super) fn format_merkle_path(bytes: &[u8]) -> Result<Vec<String>, String> {
+    if bytes.is_empty() {
+        return Ok(vec![]);
+    }
 
-pub(super) fn format_merkle_paths(paths: Vec<Receipt>) -> Result<Vec<GetReceiptsResponse>, String> {
-    paths
-        .into_iter()
-        .map(|receipt| {
-            if let Some(merkle_path) = &receipt.merkle_path {
-                if merkle_path.is_empty() {
-                    return Ok(GetReceiptsResponse {
-                        status: receipt.status,
-                        merkle_path: Vec::new(),
-                        nonce: receipt.nonce,
-                        address: receipt.address,
-                    });
-                }
-                if merkle_path.len() % 32 != 0 {
-                    return Err("merkle path length is not a multiple of 32 bytes".into());
-                }
+    if bytes.len() % 32 != 0 {
+        return Err("merkle path length is not a multiple of 32 bytes".into());
+    }
 
-                let formatted_merkle_path = merkle_path
-                    .chunks(32)
-                    .map(|chunk| format!("0x{}", hex::encode(chunk)))
-                    .collect();
-
-                Ok(GetReceiptsResponse {
-                    status: receipt.status,
-                    merkle_path: formatted_merkle_path,
-                    nonce: receipt.nonce,
-                    address: receipt.address,
-                })
-            } else {
-                Ok(GetReceiptsResponse {
-                    status: receipt.status,
-                    merkle_path: Vec::new(),
-                    nonce: receipt.nonce,
-                    address: receipt.address,
-                })
-            }
-        })
-        .collect()
+    Ok(bytes
+        .chunks(32)
+        .map(|chunk| format!("0x{}", hex::encode(chunk)))
+        .collect())
 }

aggregation_mode/batcher/src/server/http.rs

@@ -11,15 +11,16 @@ use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
 use sqlx::types::BigDecimal;
 
 use super::{
-    helpers::format_merkle_paths,
+    helpers::format_merkle_path,
     types::{AppResponse, GetReceiptsQueryParams},
 };
 
 use crate::{
     config::Config,
     db::Db,
     server::types::{
-        SubmitProofRequest, SubmitProofRequestMessageRisc0, SubmitProofRequestMessageSP1,
+        GetReceiptsResponse, SubmitProofRequest, SubmitProofRequestMessageRisc0,
+        SubmitProofRequestMessageSP1,
     },
 };
 
@@ -232,14 +233,34 @@ impl BatcherServer {
             ));
         };
 
-        match format_merkle_paths(receipts) {
-            Ok(receipts) => {
-                HttpResponse::Ok().json(AppResponse::new_sucessfull(serde_json::json!({
-                    "receipts": receipts
-                })))
-            }
-            Err(_) => HttpResponse::InternalServerError()
-                .json(AppResponse::new_unsucessfull("Internal server error", 500)),
+        let mut responses: Vec<GetReceiptsResponse> = Vec::new();
+        for receipt in receipts {
+            let Some(merkle_path) = receipt.merkle_path else {
+                responses.push(GetReceiptsResponse {
+                    status: receipt.status,
+                    merkle_path: Vec::new(),
+                    nonce: receipt.nonce,
+                    address: receipt.address,
+                });
+
+                continue;
+            };
+
+            let Ok(formatted_merkle_path) = format_merkle_path(&merkle_path) else {
+                return HttpResponse::InternalServerError()
+                    .json(AppResponse::new_unsucessfull("Internal server error", 500));
+            };
+
+            responses.push(GetReceiptsResponse {
+                status: receipt.status,
+                merkle_path: formatted_merkle_path,
+                nonce: receipt.nonce,
+                address: receipt.address,
+            });
         }
+
+        HttpResponse::Ok().json(AppResponse::new_sucessfull(serde_json::json!({
+            "receipts": responses
+        })))
     }
 }