just fix

Author: niran

crates/simulator/src/config/mod.rs

@@ -1,5 +1,5 @@
-mod simulator_node;
 pub mod playground;
+mod simulator_node;
 
 pub use playground::PlaygroundOptions;
 pub use simulator_node::SimulatorNodeConfig;
@@ -44,18 +44,10 @@ impl CliExt for Cli {
 }
 
 impl SimulatorNodeConfig {
-    pub fn into_parts(
-        self,
-        cli: Cli,
-    ) -> (Cli, ExExSimulationConfig, MempoolListenerConfig, u64) {
+    pub fn into_parts(self, cli: Cli) -> (Cli, ExExSimulationConfig, MempoolListenerConfig, u64) {
         let exex_config = (&self).into();
         let mempool_config = (&self).into();
-        (
-            cli,
-            exex_config,
-            mempool_config,
-            self.chain_block_time,
-        )
+        (cli, exex_config, mempool_config, self.chain_block_time)
     }
 }
 

crates/simulator/src/config/playground.rs

@@ -20,7 +20,7 @@
 
 use alloy_primitives::hex;
 use anyhow::{anyhow, Result};
-use clap::{CommandFactory, parser::ValueSource};
+use clap::{parser::ValueSource, CommandFactory};
 use core::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
     time::Duration,
@@ -351,4 +351,3 @@ fn resolve_trusted_peer_host() -> Host {
         Host::Ipv4(Ipv4Addr::LOCALHOST)
     }
 }
-

crates/simulator/src/config/simulator_node.rs

@@ -1,7 +1,4 @@
-use crate::{
-    listeners::MempoolListenerConfig,
-    types::ExExSimulationConfig,
-};
+use crate::{listeners::MempoolListenerConfig, types::ExExSimulationConfig};
 use anyhow::{anyhow, Result};
 use clap::Args;
 use std::path::PathBuf;
@@ -30,11 +27,7 @@ pub struct SimulatorNodeConfig {
     pub kafka_brokers: String,
 
     /// Kafka topic for mempool events
-    #[arg(
-        long,
-        env = "TIPS_SIMULATOR_KAFKA_TOPIC",
-        default_value = "tips-audit"
-    )]
+    #[arg(long, env = "TIPS_SIMULATOR_KAFKA_TOPIC", default_value = "tips-audit")]
     pub kafka_topic: String,
 
     /// Kafka consumer group ID
@@ -102,4 +95,3 @@ fn expand_path(s: &str) -> Result<PathBuf> {
         .parse()
         .map_err(|e| anyhow!("invalid path after expansion: {e}"))
 }
-

crates/simulator/src/core.rs

@@ -29,10 +29,7 @@ where
     P: SimulationPublisher,
 {
     pub fn new(engine: E, publisher: P) -> Self {
-        Self { 
-            engine, 
-            publisher,
-        }
+        Self { engine, publisher }
     }
 }
 

crates/simulator/src/engine.rs

@@ -101,10 +101,7 @@ where
 #[async_trait]
 pub trait SimulationEngine: Send + Sync {
     /// Simulate a bundle execution
-    async fn simulate_bundle(
-        &self,
-        request: &SimulationRequest,
-    ) -> Result<SimulationResult>;
+    async fn simulate_bundle(&self, request: &SimulationRequest) -> Result<SimulationResult>;
 }
 
 #[derive(Clone)]
@@ -134,10 +131,7 @@ where
     Node: FullNodeComponents,
     <Node as FullNodeComponents>::Evm: ConfigureEvm<NextBlockEnvCtx = OpNextBlockEnvAttributes>,
 {
-    async fn simulate_bundle(
-        &self,
-        request: &SimulationRequest,
-    ) -> Result<SimulationResult> {
+    async fn simulate_bundle(&self, request: &SimulationRequest) -> Result<SimulationResult> {
         let start_time = Instant::now();
         let simulation_id = Uuid::new_v4();
 

crates/simulator/src/lib.rs

@@ -25,13 +25,9 @@ pub use worker_pool::SimulationWorkerPool;
 // Type aliases for concrete implementations
 pub type TipsBundleSimulator<Node> =
     RethBundleSimulator<RethSimulationEngine<Node>, TipsSimulationPublisher>;
-pub type TipsExExEventListener<Node> = ExExEventListener<
-    Node,
-    TipsBundleSimulator<Node>,
-    tips_datastore::PostgresDatastore,
->;
-pub type TipsMempoolEventListener<Node> =
-    MempoolEventListener<Node, TipsBundleSimulator<Node>>;
+pub type TipsExExEventListener<Node> =
+    ExExEventListener<Node, TipsBundleSimulator<Node>, tips_datastore::PostgresDatastore>;
+pub type TipsMempoolEventListener<Node> = MempoolEventListener<Node, TipsBundleSimulator<Node>>;
 
 // Initialization functions
 

crates/simulator/src/listeners/exex.rs

@@ -136,7 +136,7 @@ where
                 );
 
                 // Process each block in the committed chain
-                for (_block_num, block) in new.blocks() {
+                for block in new.blocks().values() {
                     let block_hash = block.hash();
                     self.process_block((&block_hash, block)).await?;
                 }
@@ -156,7 +156,7 @@ where
                 );
 
                 // Process the new canonical chain
-                for (_block_num, block) in new.blocks() {
+                for block in new.blocks().values() {
                     let block_hash = block.hash();
                     self.process_block((&block_hash, block)).await?;
                 }

crates/simulator/src/main.rs

@@ -27,8 +27,10 @@ fn main() -> eyre::Result<()> {
 
     cli.run(|builder, _| async move {
         // Keep the Base mempool private.
-        let mut rollup_args = RollupArgs::default();
-        rollup_args.disable_txpool_gossip = true;
+        let rollup_args = RollupArgs {
+            disable_txpool_gossip: true,
+            ..Default::default()
+        };
 
         let handle = builder
             .node(reth_optimism_node::OpNode::new(rollup_args))

crates/simulator/src/worker_pool.rs

@@ -35,10 +35,7 @@ where
     B: BundleSimulator + 'static,
 {
     /// Create a new simulation worker pool
-    pub fn new(
-        simulator: Arc<B>,
-        max_concurrent_simulations: usize,
-    ) -> Arc<Self> {
+    pub fn new(simulator: Arc<B>, max_concurrent_simulations: usize) -> Arc<Self> {
         let (simulation_tx, simulation_rx) = mpsc::channel(1000);
 
         Arc::new(Self {
@@ -132,11 +129,7 @@ where
             }
 
             // Execute the simulation
-            match pool
-                .simulator
-                .simulate(&task.request)
-                .await
-            {
+            match pool.simulator.simulate(&task.request).await {
                 Ok(_) => {
                     debug!(
                         worker_id,

crates/simulator/tests/common/builders.rs

@@ -159,8 +159,8 @@ impl SimulationResultBuilder {
         let mut builder = Self::new();
         builder.success = false;
         builder.gas_used = None;
-        builder.error = Some(SimulationError::Unknown { 
-            message: "Test failure".to_string() 
+        builder.error = Some(SimulationError::Unknown {
+            message: "Test failure".to_string(),
         });
         builder
     }
@@ -211,7 +211,11 @@ impl SimulationResultBuilder {
     }
 
     pub fn with_invalid_nonce(self, tx_index: usize, expected: u64, actual: u64) -> Self {
-        self.with_error(SimulationError::InvalidNonce { tx_index, expected, actual })
+        self.with_error(SimulationError::InvalidNonce {
+            tx_index,
+            expected,
+            actual,
+        })
     }
 
     pub fn build(self) -> SimulationResult {
@@ -232,8 +236,8 @@ impl SimulationResultBuilder {
                 self.block_number,
                 self.block_hash.unwrap_or_else(B256::random),
                 self.execution_time_us,
-                self.error.unwrap_or(SimulationError::Unknown { 
-                    message: "Unknown error".to_string() 
+                self.error.unwrap_or(SimulationError::Unknown {
+                    message: "Unknown error".to_string(),
                 }),
             )
         }
@@ -268,13 +272,12 @@ impl ScenarioBuilder {
     }
 
     pub fn add_simple_bundle(mut self, num_txs: usize) -> Self {
-        let mut builder = TestBundleBuilder::new()
-            .with_block_number(self.block_number);
-        
+        let mut builder = TestBundleBuilder::new().with_block_number(self.block_number);
+
         for i in 0..num_txs {
             builder = builder.with_simple_transaction(&[i as u8, 0x01, 0x02]);
         }
-        
+
         self.bundles.push(builder.build());
         self
     }