just fix

Author: niran

crates/flashblocks-rpc/tests/layering.rs

@@ -24,8 +24,10 @@ use alloy_genesis::GenesisAccount;
 use alloy_primitives::{Address, B256, U256};
 use eyre::Context;
 use rand::{SeedableRng, rngs::StdRng};
-use reth::api::NodeTypesWithDBAdapter;
-use reth::revm::db::{AccountState, BundleState, Cache, CacheDB, DbAccount, State};
+use reth::{
+    api::NodeTypesWithDBAdapter,
+    revm::db::{AccountState, BundleState, Cache, CacheDB, DbAccount, State},
+};
 use reth_db::{
     ClientVersion, DatabaseEnv, init_db,
     mdbx::{DatabaseArguments, KILOBYTE, MEGABYTE, MaxReadTransactionDuration},
@@ -35,11 +37,11 @@ use reth_optimism_chainspec::{BASE_MAINNET, OpChainSpec, OpChainSpecBuilder};
 use reth_optimism_node::OpNode;
 use reth_primitives_traits::SealedHeader;
 use reth_provider::{
-    HeaderProvider, ProviderFactory, StateProviderFactory, providers::{BlockchainProvider, StaticFileProvider},
+    HeaderProvider, ProviderFactory, StateProviderFactory,
+    providers::{BlockchainProvider, StaticFileProvider},
 };
 use reth_testing_utils::generators::generate_keys;
-use revm::Database;
-use revm::primitives::KECCAK_EMPTY;
+use revm::{Database, primitives::KECCAK_EMPTY};
 
 type NodeTypes = NodeTypesWithDBAdapter<OpNode, Arc<TempDatabase<DatabaseEnv>>>;
 
@@ -170,10 +172,7 @@ fn layering_old_state_only_cannot_see_pending_state() -> eyre::Result<()> {
     let account = db.basic(alice_address)?.expect("account should exist");
 
     // Old implementation sees canonical nonce (0), not any pending state
-    assert_eq!(
-        account.nonce, 0,
-        "Old State-only layering can only see canonical state"
-    );
+    assert_eq!(account.nonce, 0, "Old State-only layering can only see canonical state");
 
     Ok(())
 }
@@ -337,12 +336,8 @@ fn layering_cachedb_makes_pending_balance_visible() -> eyre::Result<()> {
         .provider
         .state_by_block_hash(harness.header.hash())
         .context("getting state provider")?;
-    let canonical_balance2 =
-        state_provider2.account_balance(&alice_address)?.unwrap_or(U256::ZERO);
-    assert_eq!(
-        canonical_balance, canonical_balance2,
-        "Canonical state should be unchanged"
-    );
+    let canonical_balance2 = state_provider2.account_balance(&alice_address)?.unwrap_or(U256::ZERO);
+    assert_eq!(canonical_balance, canonical_balance2, "Canonical state should be unchanged");
 
     Ok(())
 }
@@ -409,10 +404,7 @@ fn layering_bundle_prestate_makes_pending_nonce_visible() -> eyre::Result<()> {
 
     // Read through State without prestate - should see canonical nonce (0)
     let account2 = db_without_prestate.basic(alice_address)?.expect("account should exist");
-    assert_eq!(
-        account2.nonce, 0,
-        "State without bundle_prestate should see canonical nonce"
-    );
+    assert_eq!(account2.nonce, 0, "State without bundle_prestate should see canonical nonce");
 
     Ok(())
 }

crates/flashblocks-rpc/tests/state.rs

@@ -865,18 +865,10 @@ async fn test_eth_call_sees_flashblock_state_changes() {
 
     // Flashblock 1: Alice sends a large amount to Bob
     let transfer_to_bob = 1_000_000_000_000_000_000u128; // 1 ETH
-    let tx = test.build_transaction_to_send_eth_with_nonce(
-        User::Alice,
-        User::Bob,
-        transfer_to_bob,
-        0,
-    );
-    test.send_flashblock(
-        FlashblockBuilder::new(&test, 1)
-            .with_transactions(vec![tx])
-            .build(),
-    )
-    .await;
+    let tx =
+        test.build_transaction_to_send_eth_with_nonce(User::Alice, User::Bob, transfer_to_bob, 0);
+    test.send_flashblock(FlashblockBuilder::new(&test, 1).with_transactions(vec![tx]).build())
+        .await;
 
     // Verify via state overrides that Bob received the funds
     let overrides = test
@@ -928,27 +920,20 @@ async fn test_sequential_nonces_across_flashblocks() {
     // Flashblock 1: Alice sends to Bob with nonce 0
     let tx_nonce_0 = test.build_transaction_to_send_eth_with_nonce(User::Alice, User::Bob, 1000, 0);
     test.send_flashblock(
-        FlashblockBuilder::new(&test, 1)
-            .with_transactions(vec![tx_nonce_0])
-            .build(),
+        FlashblockBuilder::new(&test, 1).with_transactions(vec![tx_nonce_0]).build(),
     )
     .await;
 
     // Verify flashblock 1 was processed - Alice's pending nonce should now be 1
     let alice_state = test.account_state(User::Alice);
-    assert_eq!(
-        alice_state.nonce, 1,
-        "After flashblock 1, Alice's pending nonce should be 1"
-    );
+    assert_eq!(alice_state.nonce, 1, "After flashblock 1, Alice's pending nonce should be 1");
 
     // Flashblock 2: Alice sends to Charlie with nonce 1
     // This will FAIL if the execution layer can't see flashblock 1's state change
     let tx_nonce_1 =
         test.build_transaction_to_send_eth_with_nonce(User::Alice, User::Charlie, 2000, 1);
     test.send_flashblock(
-        FlashblockBuilder::new(&test, 2)
-            .with_transactions(vec![tx_nonce_1])
-            .build(),
+        FlashblockBuilder::new(&test, 2).with_transactions(vec![tx_nonce_1]).build(),
     )
     .await;
 

crates/metering/src/tests/meter.rs

@@ -7,8 +7,11 @@ use alloy_primitives::{Address, B256, Bytes, U256, keccak256};
 use eyre::Context;
 use op_alloy_consensus::OpTxEnvelope;
 use rand::{SeedableRng, rngs::StdRng};
-use reth::revm::db::{BundleState, Cache};
-use reth::{api::NodeTypesWithDBAdapter, chainspec::EthChainSpec};
+use reth::{
+    api::NodeTypesWithDBAdapter,
+    chainspec::EthChainSpec,
+    revm::db::{BundleState, Cache},
+};
 use reth_db::{DatabaseEnv, test_utils::TempDatabase};
 use reth_optimism_chainspec::{BASE_MAINNET, OpChainSpec, OpChainSpecBuilder};
 use reth_optimism_node::OpNode;
@@ -465,4 +468,3 @@ fn meter_bundle_requires_correct_layering_for_pending_nonce() -> eyre::Result<()
 
     Ok(())
 }
-