tests: migration after merge

Author: greged93

Cargo.lock

@@ -105,6 +105,12 @@ impl<'a> EventWaiter<'a> {
         .await
     }
 
+    /// Wait for an L1 reorg event.
+    pub async fn l1_reorg(self) -> eyre::Result<()> {
+        self.wait_for_event(|e| matches!(e, ChainOrchestratorEvent::L1Reorg { .. }).then_some(()))
+            .await
+    }
+
     /// Wait for a new block received event from the network.
     pub async fn new_block_received(self) -> eyre::Result<ScrollBlock> {
         self.wait_for_event(|e| {

crates/node/src/test_utils/event_utils.rs

@@ -173,9 +173,7 @@ impl<'a> L1MessageBuilder<'a> {
 
     /// Send the L1 message to the database and notify nodes.
     pub async fn send(self) -> eyre::Result<TxL1Message> {
-        let sender = self
-            .sender
-            .unwrap_or_else(|| self.l1_helper.fixture.wallet().blocking_lock().inner.address());
+        let sender = self.sender.unwrap_or_else(|| Address::random());
 
         let tx_l1_message = TxL1Message {
             queue_index: self.queue_index,

crates/node/src/test_utils/l1_helpers.rs

@@ -27,21 +27,6 @@ impl<'a> TxHelper<'a> {
     pub fn transfer(self) -> TransferTxBuilder<'a> {
         TransferTxBuilder::new(self)
     }
-
-    /// Quickly inject a simple transfer transaction.
-    pub async fn quick_transfer(self) -> eyre::Result<B256> {
-        self.transfer().inject().await
-    }
-
-    /// Inject N transfer transactions and return their hashes.
-    pub async fn inject_many(self, count: usize) -> eyre::Result<Vec<B256>> {
-        let mut hashes = Vec::with_capacity(count);
-        for _ in 0..count {
-            let hash = self.fixture.tx().for_node(self.target_node_index).quick_transfer().await?;
-            hashes.push(hash);
-        }
-        Ok(hashes)
-    }
 }
 
 /// Builder for creating transfer transactions.