cargo fmt

matter-labs · Dec 4, 2023 · f13fae3 · f13fae3
1 parent 8529fde
commit f13fae3
Show file tree

Hide file tree

Showing 10 changed files with 380 additions and 329 deletions.
diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/actors/bft/Cargo.toml b/node/actors/bft/Cargo.toml
@@ -26,3 +26,4 @@ vise.workspace = true
 [dev-dependencies]
 tokio.workspace = true
 assert_matches.workspace = true
+pretty_assertions.workspace = true
diff --git a/node/actors/bft/src/leader/state_machine.rs b/node/actors/bft/src/leader/state_machine.rs
@@ -5,7 +5,7 @@ use std::{
     unreachable,
 };
 use tracing::instrument;
-use zksync_concurrency::{ctx, metrics::LatencyHistogramExt as _, time, error::Wrap as _};
+use zksync_concurrency::{ctx, error::Wrap as _, metrics::LatencyHistogramExt as _, time};
 use zksync_consensus_roles::validator;
 
 /// The StateMachine struct contains the state of the leader. This is a simple state machine. We just store
@@ -66,7 +66,8 @@ impl StateMachine {
             validator::ConsensusMsg::ReplicaPrepare(_) => {
                 let res = match self
                     .process_replica_prepare(ctx, consensus, input.cast().unwrap())
-                    .await.wrap("process_replica_prepare()")
+                    .await
+                    .wrap("process_replica_prepare()")
                 {
                     Ok(()) => Ok(()),
                     Err(super::replica_prepare::Error::Internal(err)) => {

diff --git a/node/actors/bft/src/leader/tests.rs b/node/actors/bft/src/leader/tests.rs
diff --git a/node/actors/bft/src/lib.rs b/node/actors/bft/src/lib.rs
@@ -132,15 +132,13 @@ impl Consensus {
                                 .await
                         }
                     };
-                    
+
                     // Notify network actor that the message has been processed.
                     // Ignore sending error.
                     let _ = req.ack.send(());
                     res
                 }
-                None => {
-                    self.replica.process_input(ctx, &self.inner, None).await
-                }
+                None => self.replica.process_input(ctx, &self.inner, None).await,
             };
             if let Err(err) = res {
                 return match err {

diff --git a/node/actors/bft/src/replica/leader_prepare.rs b/node/actors/bft/src/replica/leader_prepare.rs
@@ -252,7 +252,11 @@ impl StateMachine {
                 }
 
                 // Payload should be valid.
-                if let Err(err) = self.storage.verify_payload(ctx, message.proposal.number, payload).await {
+                if let Err(err) = self
+                    .storage
+                    .verify_payload(ctx, message.proposal.number, payload)
+                    .await
+                {
                     return Err(match err {
                         err @ ctx::Error::Canceled(_) => Error::Internal(err),
                         ctx::Error::Internal(err) => Error::ProposalInvalidPayload(err),