just fix

Author: niran

crates/flashblocks-rpc/src/tests/rpc.rs

@@ -1,19 +1,17 @@
 #[cfg(test)]
 mod tests {
-    use crate::rpc::{EthApiExt, EthApiOverrideServer};
-    use crate::state::FlashblocksState;
-    use crate::subscription::{Flashblock, FlashblocksReceiver, Metadata};
-    use crate::tests::{BLOCK_INFO_TXN, BLOCK_INFO_TXN_HASH};
+    use std::{str::FromStr, sync::Arc};
+
     use alloy_consensus::Receipt;
     use alloy_eips::BlockNumberOrTag;
-    use alloy_primitives::map::HashMap;
-    use alloy_primitives::{Address, B256, Bytes, LogData, TxHash, U256, address, b256, bytes};
+    use alloy_primitives::{
+        Address, B256, Bytes, LogData, TxHash, U256, address, b256, bytes, map::HashMap,
+    };
     use alloy_provider::Provider;
     use alloy_rpc_client::RpcClient;
     use alloy_rpc_types::simulate::{SimBlock, SimulatePayload};
     use alloy_rpc_types_engine::PayloadId;
-    use alloy_rpc_types_eth::TransactionInput;
-    use alloy_rpc_types_eth::error::EthRpcErrorCode;
+    use alloy_rpc_types_eth::{TransactionInput, error::EthRpcErrorCode};
     use base_reth_test_utils::harness::TestHarness;
     use eyre::Result;
     use once_cell::sync::OnceCell;
@@ -24,11 +22,16 @@ mod tests {
     use reth_optimism_primitives::OpReceipt;
     use reth_rpc_eth_api::RpcReceipt;
     use rollup_boost::{ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1};
-    use std::str::FromStr;
-    use std::sync::Arc;
     use tokio::sync::{mpsc, oneshot};
     use tokio_stream::StreamExt;
 
+    use crate::{
+        rpc::{EthApiExt, EthApiOverrideServer},
+        state::FlashblocksState,
+        subscription::{Flashblock, FlashblocksReceiver, Metadata},
+        tests::{BLOCK_INFO_TXN, BLOCK_INFO_TXN_HASH},
+    };
+
     pub struct TestSetup {
         sender: mpsc::Sender<(Flashblock, oneshot::Sender<()>)>,
         harness: TestHarness,

crates/flashblocks-rpc/src/tests/state.rs

@@ -1,28 +1,35 @@
 #[cfg(test)]
 mod tests {
-    use crate::rpc::{FlashblocksAPI, PendingBlocksAPI};
-    use crate::state::FlashblocksState;
-    use crate::subscription::{Flashblock, FlashblocksReceiver, Metadata};
-    use crate::tests::{BLOCK_INFO_TXN, BLOCK_INFO_TXN_HASH};
+    use std::time::Duration;
+
     use alloy_consensus::{Receipt, Transaction};
     use alloy_eips::{BlockHashOrNumber, Encodable2718};
-    use alloy_primitives::map::foldhash::HashMap;
-    use alloy_primitives::{Address, B256, BlockNumber, Bytes, U256, hex};
+    use alloy_primitives::{Address, B256, BlockNumber, Bytes, U256, hex, map::foldhash::HashMap};
     use alloy_rpc_types_engine::PayloadId;
-    use base_reth_test_utils::accounts::TestAccounts;
-    use base_reth_test_utils::harness::TestHarness as BaseHarness;
-    use base_reth_test_utils::node::{LocalNodeProvider, default_launcher};
+    use base_reth_test_utils::{
+        accounts::TestAccounts,
+        harness::TestHarness as BaseHarness,
+        node::{LocalNodeProvider, default_launcher},
+    };
     use op_alloy_consensus::OpDepositReceipt;
     use op_alloy_network::BlockResponse;
-    use reth::chainspec::EthChainSpec;
-    use reth::providers::{AccountReader, BlockNumReader, BlockReader};
-    use reth::transaction_pool::test_utils::TransactionBuilder;
+    use reth::{
+        chainspec::EthChainSpec,
+        providers::{AccountReader, BlockNumReader, BlockReader},
+        transaction_pool::test_utils::TransactionBuilder,
+    };
     use reth_optimism_primitives::{OpBlock, OpReceipt, OpTransactionSigned};
     use reth_primitives_traits::{Account, Block as BlockT, RecoveredBlock};
     use reth_provider::{ChainSpecProvider, StateProviderFactory};
     use rollup_boost::{ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1};
-    use std::time::Duration;
     use tokio::time::sleep;
+
+    use crate::{
+        rpc::{FlashblocksAPI, PendingBlocksAPI},
+        state::FlashblocksState,
+        subscription::{Flashblock, FlashblocksReceiver, Metadata},
+        tests::{BLOCK_INFO_TXN, BLOCK_INFO_TXN_HASH},
+    };
     // The amount of time to wait (in milliseconds) after sending a new flashblock or canonical block
     // so it can be processed by the state processor
     const SLEEP_TIME: u64 = 10;

crates/test-utils/src/engine.rs

@@ -3,20 +3,22 @@
 //! This module provides a typed, type-safe Engine API client based on
 //! reth's OpEngineApiClient trait instead of raw string-based RPC calls.
 
+use std::{marker::PhantomData, time::Duration};
+
 use alloy_eips::eip7685::Requests;
 use alloy_primitives::B256;
 use alloy_rpc_types_engine::{ForkchoiceUpdated, PayloadId, PayloadStatus};
 use eyre::Result;
 use jsonrpsee::core::client::SubscriptionClientT;
 use op_alloy_rpc_types_engine::OpExecutionPayloadV4;
-use reth::api::{EngineTypes, PayloadTypes};
-use reth::rpc::types::engine::ForkchoiceState;
+use reth::{
+    api::{EngineTypes, PayloadTypes},
+    rpc::types::engine::ForkchoiceState,
+};
 use reth_optimism_node::OpEngineTypes;
 use reth_optimism_rpc::OpEngineApiClient;
 use reth_rpc_layer::{AuthClientLayer, JwtSecret};
 use reth_tracing::tracing::debug;
-use std::marker::PhantomData;
-use std::time::Duration;
 use url::Url;
 
 /// Default JWT secret for testing

crates/test-utils/src/harness.rs

@@ -1,8 +1,7 @@
 //! Unified test harness combining node, engine API, and flashblocks functionality
 
-use crate::accounts::TestAccounts;
-use crate::engine::{EngineApi, IpcEngine};
-use crate::node::{LocalFlashblocksState, LocalNode, LocalNodeProvider, OpAddOns, OpBuilder};
+use std::{sync::Arc, time::Duration};
+
 use alloy_eips::{BlockHashOrNumber, eip7685::Requests};
 use alloy_primitives::{B256, Bytes, bytes};
 use alloy_provider::{Provider, RootProvider};
@@ -13,16 +12,22 @@ use eyre::{Result, eyre};
 use futures_util::Future;
 use op_alloy_network::Optimism;
 use op_alloy_rpc_types_engine::OpPayloadAttributes;
-use reth::builder::NodeHandle;
-use reth::providers::{BlockNumReader, BlockReader};
+use reth::{
+    builder::NodeHandle,
+    providers::{BlockNumReader, BlockReader},
+};
 use reth_e2e_test_utils::Adapter;
 use reth_optimism_node::OpNode;
 use reth_optimism_primitives::OpBlock;
 use reth_primitives_traits::{Block as BlockT, RecoveredBlock};
-use std::sync::Arc;
-use std::time::Duration;
 use tokio::time::sleep;
 
+use crate::{
+    accounts::TestAccounts,
+    engine::{EngineApi, IpcEngine},
+    node::{LocalFlashblocksState, LocalNode, LocalNodeProvider, OpAddOns, OpBuilder},
+};
+
 const BLOCK_TIME_SECONDS: u64 = 2;
 const GAS_LIMIT: u64 = 200_000_000;
 const NODE_STARTUP_DELAY_MS: u64 = 500;
@@ -179,12 +184,12 @@ impl TestHarness {
 
 #[cfg(test)]
 mod tests {
-    use crate::node::default_launcher;
-
-    use super::*;
     use alloy_primitives::U256;
     use alloy_provider::Provider;
 
+    use super::*;
+    use crate::node::default_launcher;
+
     #[tokio::test]
     async fn test_harness_setup() -> Result<()> {
         reth_tracing::init_test_tracing();

crates/test-utils/src/node.rs

@@ -1,23 +1,28 @@
 //! Local node setup with Base Sepolia chainspec
 
-use crate::engine::EngineApi;
+use std::{any::Any, net::SocketAddr, sync::Arc};
+
 use alloy_genesis::Genesis;
 use alloy_provider::RootProvider;
 use alloy_rpc_client::RpcClient;
-use base_reth_flashblocks_rpc::rpc::{EthApiExt, EthApiOverrideServer};
-use base_reth_flashblocks_rpc::state::FlashblocksState;
-use base_reth_flashblocks_rpc::subscription::{Flashblock, FlashblocksReceiver};
+use base_reth_flashblocks_rpc::{
+    rpc::{EthApiExt, EthApiOverrideServer},
+    state::FlashblocksState,
+    subscription::{Flashblock, FlashblocksReceiver},
+};
 use eyre::Result;
 use futures_util::Future;
 use once_cell::sync::OnceCell;
 use op_alloy_network::Optimism;
-use reth::api::{FullNodeTypesAdapter, NodeTypesWithDBAdapter};
-use reth::args::{DiscoveryArgs, NetworkArgs, RpcServerArgs};
-use reth::builder::{
-    Node, NodeBuilder, NodeBuilderWithComponents, NodeConfig, NodeHandle, WithLaunchContext,
+use reth::{
+    api::{FullNodeTypesAdapter, NodeTypesWithDBAdapter},
+    args::{DiscoveryArgs, NetworkArgs, RpcServerArgs},
+    builder::{
+        Node, NodeBuilder, NodeBuilderWithComponents, NodeConfig, NodeHandle, WithLaunchContext,
+    },
+    core::exit::NodeExitFuture,
+    tasks::TaskManager,
 };
-use reth::core::exit::NodeExitFuture;
-use reth::tasks::TaskManager;
 use reth_db::{
     ClientVersion, DatabaseEnv, init_db,
     mdbx::DatabaseArguments,
@@ -30,16 +35,13 @@ use reth_node_core::{
     dirs::{DataDirPath, MaybePlatformPath},
 };
 use reth_optimism_chainspec::OpChainSpec;
-use reth_optimism_node::OpNode;
-use reth_optimism_node::args::RollupArgs;
-use reth_provider::CanonStateSubscriptions;
-use reth_provider::providers::BlockchainProvider;
-use std::any::Any;
-use std::net::SocketAddr;
-use std::sync::Arc;
+use reth_optimism_node::{OpNode, args::RollupArgs};
+use reth_provider::{CanonStateSubscriptions, providers::BlockchainProvider};
 use tokio::sync::{mpsc, oneshot};
 use tokio_stream::StreamExt;
 
+use crate::engine::EngineApi;
+
 pub const BASE_CHAIN_ID: u64 = 84532;
 
 pub type LocalNodeProvider = BlockchainProvider<NodeTypesWithDBAdapter<OpNode, TmpDB>>;