fix: Address review comments

- Imports at the top
- Remove unnecessary chain_block_time logic
- Fix uniswap v3 integration test by increasing the stop block a bit

#time 2h 37m

Author: dianacarvalho1

protocol-testing/Cargo.lock

@@ -8,9 +8,9 @@ glob = "0.3.0"
 miette = { version = "7.6.0", features = ["fancy"] }
 # Logging & Tracing
 tracing = "0.1.37"
-tycho-simulation = { path = "../../tycho-simulation", features = ["evm"] }
-tycho-test = { path = "../../tycho-simulation/tycho-test" }
-tycho-execution = { path = "../../tycho-execution" }
+tycho-simulation = { git = "https://github.com/propeller-heads/tycho-simulation.git", tag = "0.197.0", features = ["evm"] }
+tycho-test = { git = "https://github.com/propeller-heads/tycho-simulation.git", tag = "0.197.0" }
+tycho-execution = ">=0.134.0"
 num-bigint = "0.4"
 num-traits = "0.2"
 num-rational = "0.4.2"

protocol-testing/Cargo.toml

@@ -32,7 +32,7 @@ use tycho_simulation::{
     tycho_client::feed::{synchronizer::StateSyncMessage, BlockHeader, FeedMessage},
     tycho_common::{
         dto::{Chain, ProtocolComponent, ResponseProtocolState},
-        models::token::Token,
+        models::{token::Token, Chain as ChainModel},
         Bytes,
     },
 };
@@ -63,16 +63,6 @@ static CLONE_TO_BASE_PROTOCOL: LazyLock<HashMap<&str, &str>> = LazyLock::new(||
     ])
 });
 
-/// Returns the approximate block time in seconds for different chains
-fn get_chain_block_time(chain: Chain) -> u64 {
-    match chain {
-        Chain::Ethereum => 12, // ~12 seconds
-        Chain::Base => 2,      // ~2 seconds
-        Chain::Unichain => 1,  // ~1 second
-        _ => 12,               // Default fallback to Ethereum timing
-    }
-}
-
 pub enum TestType {
     Full(TestTypeFull),
     Range(TestTypeRange),
@@ -277,7 +267,7 @@ impl TestRunner {
     async fn run_live_testing(&self, config: &IntegrationTestsConfig) -> miette::Result<()> {
         info!("Starting live testing for protocol {}", &config.protocol_system);
 
-        let chain = tycho_simulation::tycho_common::models::Chain::from(self.chain);
+        let chain = ChainModel::from(self.chain);
         // Load tokens for the stream
         let all_tokens = tycho_simulation::utils::load_all_tokens(
             "http://localhost:4242",
@@ -396,11 +386,7 @@ impl TestRunner {
                         execution_data.len()
                     );
 
-                    // Step 2: Sleep for block time (chain-specific)
-                    tokio::time::sleep(std::time::Duration::from_secs(self.get_chain_block_time()))
-                        .await;
-
-                    // Step 3: Get the actual block from RPC
+                    // Step 2: Get the actual block from RPC
                     let block = match self
                         .rpc_provider
                         .get_block(BlockNumberOrTag::Number(update.block_number_or_timestamp))
@@ -422,7 +408,7 @@ impl TestRunner {
                         execution_data.len()
                     );
 
-                    // Step 4: Execute the batch against the real block
+                    // Step 3: Execute the batch against the real block
                     match self
                         .run_execution(
                             execution_data,
@@ -1047,8 +1033,7 @@ impl TestRunner {
                             (protocol_system): EXECUTOR_ADDRESS
                         }
                     });
-                    let chain_model =
-                        tycho_simulation::tycho_common::models::Chain::from(self.chain);
+                    let chain_model = ChainModel::from(self.chain);
                     let (solution, calldata) = encode_swap(
                         component,
                         None,
@@ -1137,7 +1122,7 @@ impl TestRunner {
             return Ok(());
         }
 
-        let chain_model = tycho_simulation::tycho_common::models::Chain::from(self.chain);
+        let chain_model = ChainModel::from(self.chain);
         let rpc_tools = RPCTools::new(self.rpc_provider.url.as_ref(), &chain_model).await?;
 
         // Prepare router overwrites data
@@ -1172,7 +1157,6 @@ impl TestRunner {
                 &rpc_tools,
                 batch.clone(),
                 block,
-                0,
                 router_overwrites_data.clone(),
             )
             .await;
@@ -1333,11 +1317,6 @@ impl TestRunner {
             Ok(None)
         }
     }
-
-    /// Gets the block time for the current chain
-    fn get_chain_block_time(&self) -> u64 {
-        get_chain_block_time(self.chain)
-    }
 }
 
 #[cfg(test)]

protocol-testing/src/test_runner.rs

@@ -1,6 +1,7 @@
 use std::{collections::HashMap, error::Error as StdError, fmt};
 
-use tracing::{debug, info};
+use tokio::time::{sleep, Duration};
+use tracing::{debug, info, warn};
 use tycho_simulation::{
     tycho_client::{
         feed::synchronizer::Snapshot,
@@ -165,9 +166,6 @@ impl TychoClient {
         protocol_system: &str,
         chain: Chain,
     ) -> Result<(), RpcError> {
-        use tokio::time::{sleep, Duration};
-        use tracing::warn;
-
         loop {
             match self
                 .get_protocol_components(protocol_system, chain)

protocol-testing/src/tycho_rpc.rs

@@ -8,7 +8,7 @@ initialized_accounts:
 tests:
   - name: test_weth_now_pool
     start_block: 22182832
-    stop_block: 22182834
+    stop_block: 22182840
     expected_components:
       - id: "0x545b7db6632ab230fd84897488291def7912319c"
         tokens: