Fix the types handling on format_merkle_paths func

Author: maximopalopoli

aggregation_mode/batcher/src/db.rs

@@ -17,18 +17,18 @@ pub enum DbError {
 #[derive(Debug, Clone, sqlx::Type, serde::Serialize)]
 #[sqlx(type_name = "task_status")]
 #[sqlx(rename_all = "lowercase")]
-enum TaskStatus {
+pub enum TaskStatus {
     Pending,
     Processing,
     Verified,
 }
 
 #[derive(Debug, Clone, sqlx::FromRow, sqlx::Type, serde::Serialize)]
 pub struct Receipt {
-    status: TaskStatus,
+    pub status: TaskStatus,
     pub merkle_path: Option<Vec<u8>>,
-    nonce: i64,
-    address: String,
+    pub nonce: i64,
+    pub address: String,
 }
 
 impl Db {

aggregation_mode/batcher/src/server/helpers.rs

@@ -1,14 +1,17 @@
-use crate::db::Receipt;
+use crate::{db::Receipt, server::types::GetReceiptsResponse};
 
-pub(super) fn format_merkle_paths(
-    paths: Vec<Receipt>,
-) -> Result<Vec<(Receipt, Vec<String>)>, String> {
+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((receipt, vec![]));
+                    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());
@@ -19,9 +22,19 @@ pub(super) fn format_merkle_paths(
                     .map(|chunk| format!("0x{}", hex::encode(chunk)))
                     .collect();
 
-                Ok((receipt, formatted_merkle_path))
+                Ok(GetReceiptsResponse {
+                    status: receipt.status,
+                    merkle_path: formatted_merkle_path,
+                    nonce: receipt.nonce,
+                    address: receipt.address,
+                })
             } else {
-                Ok((receipt, vec![]))
+                Ok(GetReceiptsResponse {
+                    status: receipt.status,
+                    merkle_path: Vec::new(),
+                    nonce: receipt.nonce,
+                    address: receipt.address,
+                })
             }
         })
         .collect()

aggregation_mode/batcher/src/server/types.rs

@@ -1,6 +1,8 @@
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+use crate::db::TaskStatus;
+
 #[derive(Serialize, Deserialize)]
 pub(super) struct AppResponse {
     status: u16,
@@ -51,3 +53,11 @@ pub(super) struct SubmitProofRequestMessageRisc0 {
     pub program_image_id: Vec<u8>,
     pub public_inputs: Vec<u8>,
 }
+
+#[derive(Debug, Clone, sqlx::FromRow, sqlx::Type, serde::Serialize)]
+pub struct GetReceiptsResponse {
+    pub status: TaskStatus,
+    pub merkle_path: Vec<String>,
+    pub nonce: i64,
+    pub address: String,
+}