test: ref: rescans_events_with_ascending_blocks to assert everything at the end

Author: 0xNeshi

tests/live/reorg.rs

@@ -69,6 +69,15 @@ async fn rescans_events_with_ascending_blocks() -> anyhow::Result<()> {
         contract.increase().send().await?.watch().await?;
     }
 
+    // reorg the chain
+    let tx_block_pairs = vec![
+        (TransactionData::JSON(contract.increase().into_transaction_request()), 0),
+        (TransactionData::JSON(contract.increase().into_transaction_request()), 1),
+        (TransactionData::JSON(contract.increase().into_transaction_request()), 2),
+    ];
+
+    provider.primary().anvil_reorg(ReorgOptions { depth: 4, tx_block_pairs }).await?;
+
     // assert initial events are emitted as expected
     assert_event_sequence!(
         stream,
@@ -80,19 +89,9 @@ async fn rescans_events_with_ascending_blocks() -> anyhow::Result<()> {
             CountIncreased { newCount: U256::from(5) }
         ]
     );
-    let mut stream = assert_empty!(stream);
-
-    // reorg the chain
-    let tx_block_pairs = vec![
-        (TransactionData::JSON(contract.increase().into_transaction_request()), 0),
-        (TransactionData::JSON(contract.increase().into_transaction_request()), 1),
-        (TransactionData::JSON(contract.increase().into_transaction_request()), 2),
-    ];
-
-    provider.primary().anvil_reorg(ReorgOptions { depth: 4, tx_block_pairs }).await?;
-
     // assert expected messages post-reorg
     assert_next!(stream, ScannerStatus::ReorgDetected);
+    // assert the reorged events are emitted
     assert_event_sequence!(
         stream,
         &[