fmt

batcher/aligned-batcher/src/lib.rs

@@ -368,11 +368,7 @@ impl Batcher {
         let msg_chain_id = client_msg.verification_data.chain_id;
         if msg_chain_id != self.chain_id {
             warn!("Received message with incorrect chain id: {msg_chain_id}");
-            send_message(
-                ws_conn_sink.clone(),
-                ResponseMessage::InvalidChainId,
-            )
-            .await;
+            send_message(ws_conn_sink.clone(), ResponseMessage::InvalidChainId).await;
 
             return Ok(());
         }
@@ -396,11 +392,7 @@ impl Batcher {
         info!("Verifying message signature...");
         let Ok(addr) = client_msg.verify_signature() else {
             error!("Signature verification error");
-            send_message(
-                ws_conn_sink.clone(),
-                ResponseMessage::InvalidSignature,
-            )
-            .await;
+            send_message(ws_conn_sink.clone(), ResponseMessage::InvalidSignature).await;
             return Ok(());
         };
         info!("Message signature verified");
@@ -466,7 +458,6 @@ impl Batcher {
             return Ok(());
         }
 
-
         // We aquire the lock first only to query if the user is already present and the lock is dropped.
         // If it was not present, then the user nonce is queried to the Aligned contract.
         // Lastly, we get a lock of the batch state again and insert the user state if it was still missing.

batcher/aligned-sdk/src/communication/messaging.rs

@@ -69,12 +69,11 @@ pub async fn send_messages(
 
     // This vector is reversed so that when responses are received, the commitments corresponding
     // to that response can simply be popped of this vector.
-    let verification_data_commitments_rev: Vec<VerificationDataCommitment> =
-        sent_verification_data
-            .into_iter()
-            .map(|vd| vd.into())
-            .rev()
-            .collect();
+    let verification_data_commitments_rev: Vec<VerificationDataCommitment> = sent_verification_data
+        .into_iter()
+        .map(|vd| vd.into())
+        .rev()
+        .collect();
 
     Ok(verification_data_commitments_rev)
 }
@@ -108,7 +107,7 @@ pub async fn receive(
             verification_data_commitments_rev,
         )
         .await?;
-        
+
         num_responses += 1;
         if num_responses == total_messages {
             info!("All message responses received");
@@ -126,10 +125,10 @@ async fn process_batch_inclusion_data(
     aligned_verification_data: &mut Vec<AlignedVerificationData>,
     verification_data_commitments_rev: &mut Vec<VerificationDataCommitment>,
 ) -> Result<(), SubmitError> {
-
     let data = msg.into_data();
     match cbor_deserialize(data.as_slice()) {
-        Ok(ResponseMessage::BatchInclusionData(batch_inclusion_data)) => { //OK case. Proofs was valid and it was included in this batch.
+        Ok(ResponseMessage::BatchInclusionData(batch_inclusion_data)) => {
+            //OK case. Proofs was valid and it was included in this batch.
             let _ = handle_batch_inclusion_data(
                 batch_inclusion_data,
                 aligned_verification_data,
@@ -171,12 +170,15 @@ async fn process_batch_inclusion_data(
                 expected_addr,
             ));
         }
-        Ok(ResponseMessage::InvalidProof(reason)) => { 
+        Ok(ResponseMessage::InvalidProof(reason)) => {
             return Err(SubmitError::InvalidProof(reason));
         }
         Ok(ResponseMessage::CreateNewTaskError(merkle_root, error)) => {
             return Err(SubmitError::BatchSubmissionFailed(
-                "Could not create task with merkle root ".to_owned() + &merkle_root + ", failed with error: " + &error, 
+                "Could not create task with merkle root ".to_owned()
+                    + &merkle_root
+                    + ", failed with error: "
+                    + &error,
             ));
         }
         Ok(ResponseMessage::ProtocolVersion(_)) => {

batcher/aligned-sdk/src/core/errors.rs

@@ -200,7 +200,9 @@ impl fmt::Display for SubmitError {
             SubmitError::InvalidProof(reason) => write!(f, "Invalid proof {}", reason),
             SubmitError::ProofTooLarge => write!(f, "Proof too Large"),
             SubmitError::InvalidReplacementMessage => write!(f, "Invalid replacement message"),
-            SubmitError::InsufficientBalance(addr) => write!(f, "Insufficient balance, address: {}", addr),
+            SubmitError::InsufficientBalance(addr) => {
+                write!(f, "Insufficient balance, address: {}", addr)
+            }
             SubmitError::InvalidPaymentServiceAddress(received_addr, expected_addr) => {
                 write!(
                     f,

batcher/aligned-sdk/src/core/types.rs

@@ -329,7 +329,6 @@ impl AlignedVerificationData {
     }
 }
 
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ProofInvalidReason {
     RejectedProof,
@@ -366,7 +365,7 @@ pub enum ResponseMessage {
     InvalidReplacementMessage,
     AddToBatchError,
     EthRpcError,
-    InvalidPaymentServiceAddress(Address, Address)
+    InvalidPaymentServiceAddress(Address, Address),
 }
 
 #[derive(Debug, Clone, Copy)]

batcher/aligned-sdk/src/sdk.rs

@@ -38,13 +38,13 @@ use log::{debug, info};
 
 use futures_util::{
     stream::{SplitSink, SplitStream},
-    StreamExt, TryStreamExt, SinkExt
+    SinkExt, StreamExt, TryStreamExt,
 };
 
+use serde_json::json;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
-use serde_json::json;
 
 /// Submits multiple proofs to the batcher to be verified in Aligned and waits for the verification on-chain.
 /// # Arguments

batcher/aligned/src/main.rs

@@ -551,7 +551,10 @@ async fn handle_submit_err(err: SubmitError, nonce_file: &str) {
         }
         SubmitError::InvalidProof(reason) => error!("Submitted proof is invalid: {}", reason),
         SubmitError::InsufficientBalance(sender_address) => {
-            error!("Insufficient balance to pay for the transaction, address: {}", sender_address)
+            error!(
+                "Insufficient balance to pay for the transaction, address: {}",
+                sender_address
+            )
         }
         _ => {}
     }