Fmt

Author: MauroToscano

batcher/aligned-batcher/src/connection.rs

@@ -2,8 +2,8 @@ use std::sync::Arc;
 
 use crate::types::{batch_queue::BatchQueueEntry, errors::BatcherError};
 use aligned_sdk::{
-    communication::serialization::cbor_serialize,
     common::types::{BatchInclusionData, SubmitProofResponseMessage, VerificationCommitmentBatch},
+    communication::serialization::cbor_serialize,
 };
 use futures_util::{stream::SplitSink, SinkExt};
 use lambdaworks_crypto::merkle_tree::merkle::MerkleTree;

batcher/aligned-batcher/src/types/batch_queue.rs

@@ -1,9 +1,9 @@
 use aligned_sdk::{
-    communication::serialization::cbor_serialize,
     common::{
         constants::CBOR_ARRAY_MAX_OVERHEAD,
         types::{NoncedVerificationData, VerificationDataCommitment},
     },
+    communication::serialization::cbor_serialize,
 };
 use ethers::types::{Address, Signature, U256};
 use priority_queue::PriorityQueue;

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

@@ -7,7 +7,8 @@ use crate::{
             AlignedVerificationData, BatchInclusionData, Network, VerificationCommitmentBatch,
             VerificationDataCommitment,
         },
-    }, verification_layer::is_proof_verified
+    },
+    verification_layer::is_proof_verified,
 };
 
 const RETRIES: u64 = 10;

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

@@ -10,17 +10,17 @@ use futures_util::future::Ready;
 use futures_util::stream::{SplitSink, TryFilter};
 use tokio_tungstenite::{tungstenite::Message, MaybeTlsStream, WebSocketStream};
 
-use crate::communication::serialization::{cbor_deserialize, cbor_serialize};
 use crate::common::types::{BatchInclusionData, SubmitProofMessage};
+use crate::communication::serialization::{cbor_deserialize, cbor_serialize};
 use crate::{
-    communication::batch::process_batcher_response,
     common::{
         errors::SubmitError,
         types::{
             AlignedVerificationData, ClientMessage, NoncedVerificationData,
             SubmitProofResponseMessage, VerificationData, VerificationDataCommitment,
         },
     },
+    communication::batch::process_batcher_response,
 };
 
 pub type ResponseStream = TryFilter<

batcher/aligned-sdk/src/lib.rs

@@ -5,11 +5,10 @@ pub mod verification_layer;
 pub mod common;
 
 // Eth and Communication modules should be outside the SDK in the future
-/// Eth module is mostly for internal use
-pub mod eth;
 /// Communication module is mostly for internal use
 /// It contains code for communication protocols
 pub mod communication;
+/// Eth module is mostly for internal use
+pub mod eth;
 
-pub (crate) mod beacon;
-
+pub(crate) mod beacon;

batcher/aligned-sdk/src/verification_layer.rs

@@ -1,10 +1,4 @@
 use crate::{
-    communication::{
-        batch::await_batch_verification,
-        messaging::{receive, send_messages, ResponseStream},
-        protocol::check_protocol_version,
-        serialization::{cbor_deserialize, cbor_serialize},
-    },
     common::{
         constants::{
             ADDITIONAL_SUBMISSION_GAS_COST_PER_PROOF, DEFAULT_CONSTANT_GAS_COST,
@@ -17,6 +11,12 @@ use crate::{
             Network, ProvingSystemId, VerificationData,
         },
     },
+    communication::{
+        batch::await_batch_verification,
+        messaging::{receive, send_messages, ResponseStream},
+        protocol::check_protocol_version,
+        serialization::{cbor_deserialize, cbor_serialize},
+    },
     eth::{
         aligned_service_manager::aligned_service_manager,
         batcher_payment_service::batcher_payment_service,

batcher/aligned-task-sender/src/commands.rs

@@ -1,5 +1,7 @@
 use aligned_sdk::common::types::{Network, ProvingSystemId, VerificationData};
-use aligned_sdk::verification_layer::{deposit_to_aligned, get_nonce_from_batcher, submit_multiple};
+use aligned_sdk::verification_layer::{
+    deposit_to_aligned, get_nonce_from_batcher, submit_multiple,
+};
 use ethers::prelude::*;
 use ethers::utils::parse_ether;
 use k256::ecdsa::SigningKey;

batcher/aligned/src/main.rs

@@ -5,20 +5,22 @@ use std::io::Write;
 use std::path::PathBuf;
 use std::str::FromStr;
 
-use aligned_sdk::communication::serialization::cbor_deserialize;
+use aligned_sdk::aggregation_layer::is_proof_verified_in_aggregation_mode;
+use aligned_sdk::aggregation_layer::AggregationModeVerificationData;
 use aligned_sdk::common::types::FeeEstimationType;
 use aligned_sdk::common::{
     errors::{AlignedError, FeeEstimateError, SubmitError},
     types::{AlignedVerificationData, Network, ProvingSystemId, VerificationData},
 };
-use aligned_sdk::aggregation_layer::is_proof_verified_in_aggregation_mode;
-use aligned_sdk::aggregation_layer::AggregationModeVerificationData;
+use aligned_sdk::communication::serialization::cbor_deserialize;
 use aligned_sdk::verification_layer::estimate_fee;
 use aligned_sdk::verification_layer::get_chain_id;
 use aligned_sdk::verification_layer::get_nonce_from_batcher;
 use aligned_sdk::verification_layer::get_nonce_from_ethereum;
 use aligned_sdk::verification_layer::{deposit_to_aligned, get_balance_in_aligned};
-use aligned_sdk::verification_layer::{get_vk_commitment, is_proof_verified, save_response, submit_multiple};
+use aligned_sdk::verification_layer::{
+    get_vk_commitment, is_proof_verified, save_response, submit_multiple,
+};
 use clap::Args;
 use clap::Parser;
 use clap::Subcommand;