fix fmt

Author: mask-pp

crates/consensus/beacon/src/engine/test_utils.rs

@@ -38,10 +38,10 @@ use reth_prune::Pruner;
 use reth_prune_types::PruneModes;
 use reth_stages::{sets::DefaultStages, test_utils::TestStages, ExecOutput, Pipeline, StageError};
 use reth_static_file::StaticFileProducer;
+use reth_taiko_engine_types::TaikoExecutionPayload;
 use reth_tasks::TokioTaskExecutor;
 use std::{collections::VecDeque, sync::Arc};
 use tokio::sync::{oneshot, watch};
-use reth_taiko_engine_types::TaikoExecutionPayload;
 
 type DatabaseEnv = TempDatabase<DE>;
 

crates/engine/tree/src/tree/mod.rs

@@ -2923,7 +2923,9 @@ mod tests {
             let payload = block_to_payload_v3(block.block.clone());
             self.tree
                 .on_new_payload(
-                    TaikoExecutionPayload::from(alloy_rpc_types_engine::ExecutionPayload::from(payload)),
+                    TaikoExecutionPayload::from(alloy_rpc_types_engine::ExecutionPayload::from(
+                        payload,
+                    )),
                     ExecutionPayloadSidecar::v3(CancunPayloadFields {
                         parent_beacon_block_root: block.parent_beacon_block_root.unwrap(),
                         versioned_hashes: vec![],
@@ -3195,7 +3197,9 @@ mod tests {
         let outcome = test_harness
             .tree
             .on_new_payload(
-                TaikoExecutionPayload::from(alloy_rpc_types_engine::ExecutionPayload::from(payload)),
+                TaikoExecutionPayload::from(alloy_rpc_types_engine::ExecutionPayload::from(
+                    payload,
+                )),
                 ExecutionPayloadSidecar::none(),
             )
             .unwrap();
@@ -3241,7 +3245,9 @@ mod tests {
             .tree
             .on_engine_message(FromEngine::Request(
                 BeaconEngineMessage::NewPayload {
-                    payload: TaikoExecutionPayload::from(alloy_rpc_types_engine::ExecutionPayload::from(payload)),
+                    payload: TaikoExecutionPayload::from(
+                        alloy_rpc_types_engine::ExecutionPayload::from(payload),
+                    ),
                     sidecar: ExecutionPayloadSidecar::none(),
                     tx,
                 }

crates/optimism/evm/src/execute.rs

@@ -18,6 +18,7 @@ use reth_evm::{
     system_calls::{OnStateHook, SystemCaller},
     ConfigureEvm, TxEnvOverrides,
 };
+use reth_execution_types::BlockExecutionInput;
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_consensus::validate_block_post_execution;
 use reth_optimism_forks::OpHardfork;
@@ -26,7 +27,6 @@ use reth_primitives::{BlockWithSenders, Receipt, TransactionSigned, TxType};
 use reth_revm::{Database, State};
 use revm_primitives::{db::DatabaseCommit, EnvWithHandlerCfg, ResultAndState, U256};
 use tracing::trace;
-use reth_execution_types::BlockExecutionInput;
 
 /// Factory for [`OpExecutionStrategy`].
 #[derive(Debug, Clone)]

crates/rpc/rpc-builder/tests/it/auth.rs

@@ -20,11 +20,15 @@ where
 {
     let block = Block::default().seal_slow();
     EngineApiClient::new_payload_v1(client, block_to_payload_v1(block.clone())).await;
-    EngineApiClient::new_payload_v2(client, TaikoExecutionPayloadInputV2 {
-        execution_payload: convert_block_to_payload_input_v2(block),
-        tx_hash: Default::default(),
-        withdrawals_hash: Default::default(),
-    }).await;
+    EngineApiClient::new_payload_v2(
+        client,
+        TaikoExecutionPayloadInputV2 {
+            execution_payload: convert_block_to_payload_input_v2(block),
+            tx_hash: Default::default(),
+            withdrawals_hash: Default::default(),
+        },
+    )
+    .await;
     EngineApiClient::fork_choice_updated_v1(client, ForkchoiceState::default(), None).await;
     EngineApiClient::get_payload_v1(client, PayloadId::new([0, 0, 0, 0, 0, 0, 0, 0])).await;
     EngineApiClient::get_payload_v2(client, PayloadId::new([0, 0, 0, 0, 0, 0, 0, 0])).await;

crates/storage/provider/src/providers/database/provider.rs

@@ -175,8 +175,8 @@ impl<TX: DbTx + 'static, N: NodeTypes> DatabaseProvider<TX, N> {
     ) -> ProviderResult<Box<dyn StateProvider + 'a>> {
         let mut block_number =
             self.block_number(block_hash)?.ok_or(ProviderError::BlockHashNotFound(block_hash))?;
-        if block_number == self.best_block_number().unwrap_or_default()
-            && block_number == self.last_block_number().unwrap_or_default()
+        if block_number == self.best_block_number().unwrap_or_default() &&
+            block_number == self.last_block_number().unwrap_or_default()
         {
             return Ok(Box::new(LatestStateProviderRef::new(self)));
         }
@@ -380,8 +380,8 @@ impl<TX: DbTx + 'static, N: NodeTypes> TryIntoHistoricalStateProvider for Databa
         self,
         mut block_number: BlockNumber,
     ) -> ProviderResult<StateProviderBox> {
-        if block_number == self.best_block_number().unwrap_or_default()
-            && block_number == self.last_block_number().unwrap_or_default()
+        if block_number == self.best_block_number().unwrap_or_default() &&
+            block_number == self.last_block_number().unwrap_or_default()
         {
             return Ok(Box::new(LatestStateProvider::new(self)));
         }
@@ -1828,8 +1828,8 @@ impl<TX: DbTxMut + DbTx + 'static, N: NodeTypesForProvider> StateWriter
 
         let mut bodies_cursor = self.tx.cursor_read::<tables::BlockBodyIndices>()?;
 
-        let has_receipts_pruning = self.prune_modes.has_receipts_pruning()
-            || execution_outcome.receipts.iter().flatten().any(|receipt| receipt.is_none());
+        let has_receipts_pruning = self.prune_modes.has_receipts_pruning() ||
+            execution_outcome.receipts.iter().flatten().any(|receipt| receipt.is_none());
 
         // Prepare receipts cursor if we are going to write receipts to the database
         //
@@ -1842,8 +1842,8 @@ impl<TX: DbTxMut + DbTx + 'static, N: NodeTypesForProvider> StateWriter
         // Prepare receipts static writer if we are going to write receipts to static files
         //
         // We are writing to static files if requested and if there's no receipt pruning configured
-        let mut receipts_static_writer = (write_receipts_to.static_files()
-            && !has_receipts_pruning)
+        let mut receipts_static_writer = (write_receipts_to.static_files() &&
+            !has_receipts_pruning)
             .then(|| {
                 self.static_file_provider
                     .get_writer(execution_outcome.first_block, StaticFileSegment::Receipts)
@@ -2674,8 +2674,8 @@ impl<TX: DbTxMut + DbTx + 'static, N: NodeTypes> HistoryWriter for DatabaseProvi
                 StorageShardedKey::last(address, storage_key),
                 rem_index,
                 |storage_sharded_key| {
-                    storage_sharded_key.address == address
-                        && storage_sharded_key.sharded_key.key == storage_key
+                    storage_sharded_key.address == address &&
+                        storage_sharded_key.sharded_key.key == storage_key
                 },
             )?;
 

crates/storage/provider/src/test_utils/mock.rs

@@ -28,8 +28,12 @@ use reth_primitives::{
 };
 use reth_primitives_traits::SignedTransaction;
 use reth_stages_types::{StageCheckpoint, StageId};
-use reth_storage_api::{DatabaseProviderFactory, HashedPostStateProvider, L1OriginReader, L1OriginWriter, StageCheckpointReader, StateCommitmentProvider, StateProofProvider, StorageRootProvider};
+use reth_storage_api::{
+    DatabaseProviderFactory, HashedPostStateProvider, L1OriginReader, L1OriginWriter,
+    StageCheckpointReader, StateCommitmentProvider, StateProofProvider, StorageRootProvider,
+};
 use reth_storage_errors::provider::{ConsistentViewError, ProviderError, ProviderResult};
+use reth_taiko_primitives::L1Origin;
 use reth_trie::{
     updates::TrieUpdates, AccountProof, HashedPostState, HashedStorage, MultiProof,
     StorageMultiProof, StorageProof, TrieInput,
@@ -41,7 +45,6 @@ use std::{
     ops::{RangeBounds, RangeInclusive},
     sync::Arc,
 };
-use reth_taiko_primitives::L1Origin;
 
 /// A mock implementation for Provider interfaces.
 #[derive(Debug, Clone)]
@@ -846,7 +849,11 @@ impl L1OriginReader for MockEthProvider {
 }
 
 impl L1OriginWriter for MockEthProvider {
-    fn save_l1_origin(&self, _block_number: BlockNumber, _l1_origin: L1Origin) -> ProviderResult<()> {
+    fn save_l1_origin(
+        &self,
+        _block_number: BlockNumber,
+        _l1_origin: L1Origin,
+    ) -> ProviderResult<()> {
         todo!()
     }
-}
+}

crates/storage/provider/src/test_utils/noop.rs

@@ -4,6 +4,15 @@ use std::{
     sync::Arc,
 };
 
+use crate::{
+    providers::StaticFileProvider,
+    traits::{BlockSource, ReceiptProvider},
+    AccountReader, BlockHashReader, BlockIdReader, BlockNumReader, BlockReader, BlockReaderIdExt,
+    ChainSpecProvider, ChangeSetReader, EvmEnvProvider, HeaderProvider, PruneCheckpointReader,
+    ReceiptProviderIdExt, StageCheckpointReader, StateProvider, StateProviderBox,
+    StateProviderFactory, StateRootProvider, StaticFileProviderFactory, TransactionVariant,
+    TransactionsProvider, WithdrawalsProvider,
+};
 use alloy_consensus::Header;
 use alloy_eips::{
     eip4895::{Withdrawal, Withdrawals},
@@ -27,23 +36,17 @@ use reth_primitives::{
 };
 use reth_prune_types::{PruneCheckpoint, PruneSegment};
 use reth_stages_types::{StageCheckpoint, StageId};
-use reth_storage_api::{HashedPostStateProvider, L1OriginReader, L1OriginWriter, NodePrimitivesProvider, StateProofProvider, StorageRootProvider};
+use reth_storage_api::{
+    HashedPostStateProvider, L1OriginReader, L1OriginWriter, NodePrimitivesProvider,
+    StateProofProvider, StorageRootProvider,
+};
 use reth_storage_errors::provider::ProviderResult;
+use reth_taiko_primitives::L1Origin;
 use reth_trie::{
     updates::TrieUpdates, AccountProof, HashedPostState, HashedStorage, MultiProof, TrieInput,
 };
 use revm::primitives::{BlockEnv, CfgEnvWithHandlerCfg};
 use tokio::sync::{broadcast, watch};
-use reth_taiko_primitives::L1Origin;
-use crate::{
-    providers::StaticFileProvider,
-    traits::{BlockSource, ReceiptProvider},
-    AccountReader, BlockHashReader, BlockIdReader, BlockNumReader, BlockReader, BlockReaderIdExt,
-    ChainSpecProvider, ChangeSetReader, EvmEnvProvider, HeaderProvider, PruneCheckpointReader,
-    ReceiptProviderIdExt, StageCheckpointReader, StateProvider, StateProviderBox,
-    StateProviderFactory, StateRootProvider, StaticFileProviderFactory, TransactionVariant,
-    TransactionsProvider, WithdrawalsProvider,
-};
 
 /// Supports various api interfaces for testing purposes.
 #[derive(Debug, Clone, Default, Copy)]
@@ -605,7 +608,11 @@ impl L1OriginReader for NoopProvider {
 }
 
 impl L1OriginWriter for NoopProvider {
-    fn save_l1_origin(&self, _block_number: BlockNumber, _l1_origin: L1Origin) -> ProviderResult<()> {
+    fn save_l1_origin(
+        &self,
+        _block_number: BlockNumber,
+        _l1_origin: L1Origin,
+    ) -> ProviderResult<()> {
         todo!()
     }
-}
+}

crates/taiko/consensus/src/lib.rs

@@ -126,12 +126,12 @@ impl<ChainSpec: Send + Sync + EthChainSpec + EthereumHardforks + Debug> HeaderVa
         validate_header_extradata(header.header())?;
 
         // EIP-4895: Beacon chain push withdrawals as operations
-        if self.chain_spec.is_shanghai_active_at_timestamp(header.timestamp)
-            && header.withdrawals_root.is_none()
+        if self.chain_spec.is_shanghai_active_at_timestamp(header.timestamp) &&
+            header.withdrawals_root.is_none()
         {
             return Err(ConsensusError::WithdrawalsRootMissing);
-        } else if !self.chain_spec.is_shanghai_active_at_timestamp(header.timestamp)
-            && header.withdrawals_root.is_some()
+        } else if !self.chain_spec.is_shanghai_active_at_timestamp(header.timestamp) &&
+            header.withdrawals_root.is_some()
         {
             return Err(ConsensusError::WithdrawalsRootUnexpected);
         }

examples/custom-beacon-withdrawals/src/main.rs

@@ -10,7 +10,7 @@ use reth::{
     api::{ConfigureEvm, ConfigureEvmEnv, NodeTypesWithEngine},
     builder::{components::ExecutorBuilder, BuilderContext, FullNodeTypes},
     cli::Cli,
-    providers::ProviderError,
+    providers::{BlockExecutionInput, ProviderError},
     revm::{
         interpreter::Host,
         primitives::{address, Address, Bytes, Env, EnvWithHandlerCfg, TransactTo, TxEnv, U256},
@@ -26,7 +26,6 @@ use reth_evm_ethereum::EthEvmConfig;
 use reth_node_ethereum::{node::EthereumAddOns, BasicBlockExecutorProvider, EthereumNode};
 use reth_primitives::{BlockWithSenders, EthPrimitives, Receipt};
 use std::{fmt::Display, sync::Arc};
-use reth::providers::BlockExecutionInput;
 
 pub const SYSTEM_ADDRESS: Address = address!("fffffffffffffffffffffffffffffffffffffffe");
 pub const WITHDRAWALS_ADDRESS: Address = address!("4200000000000000000000000000000000000000");

examples/custom-engine-types/src/main.rs

@@ -69,12 +69,12 @@ use reth_payload_builder::{
     EthBuiltPayload, EthPayloadBuilderAttributes, PayloadBuilderError, PayloadBuilderHandle,
     PayloadBuilderService,
 };
+use reth_taiko_engine_types::TaikoExecutionPayload;
 use reth_tracing::{RethTracer, Tracer};
 use reth_trie_db::MerklePatriciaTrie;
 use serde::{Deserialize, Serialize};
 use std::{convert::Infallible, sync::Arc};
 use thiserror::Error;
-use reth_taiko_engine_types::TaikoExecutionPayload;
 
 /// A custom payload attributes type.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]

examples/custom-evm/src/main.rs

@@ -23,6 +23,7 @@ use reth::{
     transaction_pool::{PoolTransaction, TransactionPool},
 };
 use reth_chainspec::{Chain, ChainSpec};
+use reth_evm::EnvExt;
 use reth_evm_ethereum::EthEvmConfig;
 use reth_node_api::{
     ConfigureEvm, ConfigureEvmEnv, FullNodeTypes, NextBlockEnvAttributes, NodeTypes,
@@ -36,7 +37,6 @@ use reth_node_ethereum::{
 use reth_primitives::{EthPrimitives, TransactionSigned};
 use reth_tracing::{RethTracer, Tracer};
 use std::{convert::Infallible, sync::Arc};
-use reth_evm::EnvExt;
 
 /// Custom EVM configuration
 #[derive(Debug, Clone)]
@@ -89,7 +89,13 @@ impl ConfigureEvmEnv for MyEvmConfig {
 
     type Error = Infallible;
 
-    fn fill_tx_env(&self, tx_env: &mut TxEnv, transaction: &TransactionSigned, sender: Address, ext: Option<EnvExt<'_>>) {
+    fn fill_tx_env(
+        &self,
+        tx_env: &mut TxEnv,
+        transaction: &TransactionSigned,
+        sender: Address,
+        ext: Option<EnvExt<'_>>,
+    ) {
         self.inner.fill_tx_env(tx_env, transaction, sender, ext);
     }
 

examples/stateful-precompile/src/main.rs

@@ -22,6 +22,7 @@ use reth::{
     tasks::TaskManager,
 };
 use reth_chainspec::{Chain, ChainSpec};
+use reth_evm::EnvExt;
 use reth_node_api::{ConfigureEvm, ConfigureEvmEnv, FullNodeTypes, NodeTypes};
 use reth_node_core::{args::RpcServerArgs, node_config::NodeConfig};
 use reth_node_ethereum::{
@@ -32,7 +33,6 @@ use reth_primitives::{EthPrimitives, TransactionSigned};
 use reth_tracing::{RethTracer, Tracer};
 use schnellru::{ByLength, LruMap};
 use std::{collections::HashMap, convert::Infallible, sync::Arc};
-use reth_evm::EnvExt;
 
 /// Type alias for the LRU cache used within the [`PrecompileCache`].
 type PrecompileLRUCache = LruMap<(Bytes, u64), PrecompileResult>;
@@ -152,7 +152,13 @@ impl ConfigureEvmEnv for MyEvmConfig {
     type Transaction = TransactionSigned;
     type Error = Infallible;
 
-    fn fill_tx_env(&self, tx_env: &mut TxEnv, transaction: &TransactionSigned, sender: Address, ext: Option<EnvExt<'_>>) {
+    fn fill_tx_env(
+        &self,
+        tx_env: &mut TxEnv,
+        transaction: &TransactionSigned,
+        sender: Address,
+        ext: Option<EnvExt<'_>>,
+    ) {
         self.inner.fill_tx_env(tx_env, transaction, sender, ext)
     }