chore: cargo fmt

tari-project · Jul 29, 2024 · eb794f5 · eb794f5
1 parent 9ca9ef6
commit eb794f5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 15 deletions.
diff --git a/applications/tari_validator_node/src/consensus/mod.rs b/applications/tari_validator_node/src/consensus/mod.rs
@@ -8,7 +8,8 @@ use tari_consensus::{
     traits::ConsensusSpec,
 };
 use tari_dan_app_utilities::{
-    consensus_constants::ConsensusConstants, template_manager::implementation::TemplateManager,
+    consensus_constants::ConsensusConstants,
+    template_manager::implementation::TemplateManager,
     transaction_executor::TariDanTransactionProcessor,
 };
 use tari_dan_common_types::PeerAddress;
@@ -29,8 +30,13 @@ use crate::{
     event_subscription::EventSubscription,
     p2p::services::messaging::{ConsensusInboundMessaging, ConsensusOutboundMessaging},
     transaction_validators::{
-        ClaimFeeTransactionValidator, EpochRangeValidator, FeeTransactionValidator, HasInputs, TemplateExistsValidator,
-        TransactionSignatureValidator, TransactionValidationError,
+        ClaimFeeTransactionValidator,
+        EpochRangeValidator,
+        FeeTransactionValidator,
+        HasInputs,
+        TemplateExistsValidator,
+        TransactionSignatureValidator,
+        TransactionValidationError,
     },
     validator::{BoxedValidator, Validator},
     ValidatorNodeConfig,

diff --git a/applications/tari_validator_node/src/p2p/rpc/service_impl.rs b/applications/tari_validator_node/src/p2p/rpc/service_impl.rs
@@ -350,8 +350,8 @@ impl ValidatorNodeRpcService for ValidatorNodeRpcServiceImpl {
             .get_local_committee_info(prev_epoch)
             .await
             .optional()
-            .map_err(RpcStatus::log_internal_error(LOG_TARGET))? else
-        {
+            .map_err(RpcStatus::log_internal_error(LOG_TARGET))?
+        else {
             return Err(RpcStatus::bad_request(format!(
                 "This validator node is not registered for the previous epoch {prev_epoch}"
             )));

diff --git a/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs b/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs
@@ -564,12 +564,11 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
 
             let Some(last_dummy) = dummy_blocks.last() else {
                 warn!(target: LOG_TARGET, "❌ Bad proposal, does not justify parent for candidate block {}", candidate_block);
-                return Err(
-                    ProposalValidationError::CandidateBlockDoesNotExtendJustify {
-                        justify_block_height: justify_block.height(),
-                        candidate_block_height: candidate_block.height(),
-                    }.into()
-                );
+                return Err(ProposalValidationError::CandidateBlockDoesNotExtendJustify {
+                    justify_block_height: justify_block.height(),
+                    candidate_block_height: candidate_block.height(),
+                }
+                .into());
             };
 
             if candidate_block.parent() != last_dummy.id() {

diff --git a/dan_layer/consensus/src/hotstuff/substate_store/pending_store.rs b/dan_layer/consensus/src/hotstuff/substate_store/pending_store.rs
@@ -79,7 +79,9 @@ impl<'a, 'tx, TStore: StateStore + 'a + 'tx> ReadableSubstateStore for PendingSu
         }
 
         let Some(substate) = SubstateRecord::get(self.read_transaction(), &id.to_substate_address()).optional()? else {
-            return Err(SubstateStoreError::SubstateNotFound { address: id.to_substate_address() });
+            return Err(SubstateStoreError::SubstateNotFound {
+                address: id.to_substate_address(),
+            });
         };
         Ok(substate.into_substate())
     }

diff --git a/dan_layer/consensus/src/hotstuff/worker.rs b/dan_layer/consensus/src/hotstuff/worker.rs
@@ -16,7 +16,9 @@ use tari_transaction::{Transaction, TransactionId};
 use tokio::sync::{broadcast, mpsc};
 
 use super::{
-    config::HotstuffConfig, on_receive_new_transaction::OnReceiveNewTransaction, proposer::Proposer,
+    config::HotstuffConfig,
+    on_receive_new_transaction::OnReceiveNewTransaction,
+    proposer::Proposer,
     ProposalValidationError,
 };
 use crate::{

diff --git a/dan_layer/consensus_tests/src/support/validator/builder.rs b/dan_layer/consensus_tests/src/support/validator/builder.rs
@@ -21,7 +21,11 @@ use crate::support::{
     messaging_impls::{TestInboundMessaging, TestOutboundMessaging},
     signing_service::TestVoteSignatureService,
     sync::AlwaysSyncedSyncManager,
-    RoundRobinLeaderStrategy, TestBlockTransactionProcessor, TestConsensusSpec, Validator, ValidatorChannels,
+    RoundRobinLeaderStrategy,
+    TestBlockTransactionProcessor,
+    TestConsensusSpec,
+    Validator,
+    ValidatorChannels,
 };
 
 pub struct ValidatorBuilder {

diff --git a/dan_layer/engine/src/runtime/working_state.rs b/dan_layer/engine/src/runtime/working_state.rs
@@ -197,7 +197,7 @@ impl WorkingState {
                 Ok(Some((before, after)))
             })?;
 
-        let Some((before, after))= maybe_before_and_after else {
+        let Some((before, after)) = maybe_before_and_after else {
             return Ok(());
         };