fix tests

Author: frisitano

crates/chain-orchestrator/src/lib.rs

@@ -405,8 +405,6 @@ impl<
                 self.sync_state.l1_mut().set_syncing();
                 let unwind_result = self.database.unwind(block_number).await?;
 
-                println!("Unwind result: {:?}", unwind_result);
-
                 // Check if the unwind impacts the fcs safe head.
                 if let Some(block_info) = unwind_result.l2_safe_block_info {
                     // If the safe head was unwound and is above or equal to the finalized head,

crates/database/db/src/operations.rs

@@ -852,7 +852,6 @@ impl<T: WriteConnectionProvider + ?Sized + Sync> DatabaseWriteOperations for T {
         // delete batch commits, l1 messages and batch finalization effects greater than the
         // provided l1 block number
         let batches_removed = self.delete_batches_gt_block_number(l1_block_number).await?;
-        println!("Deleted {} batches", batches_removed);
         let deleted_messages = self.delete_l1_messages_gt(l1_block_number).await?;
         self.delete_batch_finalization_gt_block_number(l1_block_number).await?;
         let batch_reverts_removed: u64 =

crates/node/src/test_utils/l1_helpers.rs

@@ -248,7 +248,6 @@ pub struct BatchCommitBuilder<'a> {
     block_info: BlockInfo,
     hash: B256,
     index: u64,
-    block_number: u64,
     block_timestamp: u64,
     calldata: Option<Bytes>,
     calldata_path: Option<String>,
@@ -262,7 +261,6 @@ impl<'a> BatchCommitBuilder<'a> {
             block_info: BlockInfo { number: 0, hash: B256::random() },
             hash: B256::random(),
             index: 0,
-            block_number: 0,
             block_timestamp: 0,
             calldata: None,
             calldata_path: None,
@@ -276,12 +274,6 @@ impl<'a> BatchCommitBuilder<'a> {
         self
     }
 
-    /// Set the L1 block number for this batch commit.
-    pub const fn at_block_number(mut self, block_number: u64) -> Self {
-        self.block_info.number = block_number;
-        self
-    }
-
     /// Set the batch hash.
     pub const fn hash(mut self, hash: B256) -> Self {
         self.hash = hash;
@@ -294,12 +286,6 @@ impl<'a> BatchCommitBuilder<'a> {
         self
     }
 
-    /// Set the batch block number.
-    pub const fn block_number(mut self, block_number: u64) -> Self {
-        self.block_number = block_number;
-        self
-    }
-
     /// Set the batch block timestamp.
     pub const fn block_timestamp(mut self, timestamp: u64) -> Self {
         self.block_timestamp = timestamp;
@@ -337,7 +323,7 @@ impl<'a> BatchCommitBuilder<'a> {
         let batch_data = BatchCommitData {
             hash: self.hash,
             index: self.index,
-            block_number: self.block_number,
+            block_number: self.block_info.number,
             block_timestamp: self.block_timestamp,
             calldata: Arc::new(raw_calldata),
             blob_versioned_hash: self.blob_versioned_hash,

crates/node/tests/e2e.rs

@@ -765,8 +765,6 @@ async fn shutdown_consolidates_most_recent_batch_on_startup() -> eyre::Result<()
     // Request an event stream from the rollup node manager.
     let mut rnm_events = handle.get_event_listener().await?;
 
-    println!("im here");
-
     // Send the second batch again to mimic the watcher behaviour.
     let block_1_info = BlockInfo { number: 18318215, hash: B256::random() };
     l1_notification_tx
@@ -1052,6 +1050,7 @@ async fn can_revert_to_l1_block() -> eyre::Result<()> {
 
     // Validate the safe block number is 57
     assert_eq!(status.l2.fcs.safe_block_info().number, 57);
+    assert_eq!(status.l1.status, SyncMode::Synced);
 
     Ok(())
 }
@@ -1185,7 +1184,7 @@ async fn can_handle_batch_revert_with_reorg() -> eyre::Result<()> {
         .at_block(batch_0_block_info)
         .hash(batch_0_hash)
         .index(1)
-        .block_number(18318207)
+        .at_block(batch_0_block_info)
         .block_timestamp(1696935971)
         .calldata(raw_calldata_0)
         .send()
@@ -1201,7 +1200,7 @@ async fn can_handle_batch_revert_with_reorg() -> eyre::Result<()> {
         .at_block(batch_1_block_info)
         .hash(batch_1_hash)
         .index(2)
-        .block_number(18318215)
+        .at_block(batch_1_block_info)
         .block_timestamp(1696936000)
         .calldata(raw_calldata_1)
         .send()