test: ref

Author: 0xNeshi

tests/latest_events/basic.rs

@@ -229,17 +229,11 @@ async fn latest_scanner_mixed_events_and_filters_return_correct_streams() -> any
         .event(TestCounter::CountDecreased::SIGNATURE);
     let mut stream_dec = scanner.subscribe(filter_dec);
 
-    // Sequence: inc(1), inc(2), dec(1), inc(2), dec(1)
-    // inc -> 1
-    contract.increase().send().await?.watch().await?;
-    // inc -> 2
-    contract.increase().send().await?.watch().await?;
-    // dec -> 1
-    contract.decrease().send().await?.watch().await?;
-    // inc -> 2
-    contract.increase().send().await?.watch().await?;
-    // dec -> 1
-    contract.decrease().send().await?.watch().await?;
+    contract.increase().send().await?.watch().await?; // inc(1)
+    contract.increase().send().await?.watch().await?; // inc(2)
+    contract.decrease().send().await?.watch().await?; // dec(1)
+    contract.increase().send().await?.watch().await?; // inc(2)
+    contract.decrease().send().await?.watch().await?; // dec(1)
 
     scanner.start().await?;
 

tests/sync/from_block.rs

@@ -22,10 +22,6 @@ async fn replays_historical_then_switches_to_live() -> anyhow::Result<()> {
 
     scanner.start().await?;
 
-    // now emit new events
-    contract.increase().send().await?.watch().await?;
-    contract.increase().send().await?.watch().await?;
-
     // historical events
     assert_next!(
         stream,
@@ -36,6 +32,10 @@ async fn replays_historical_then_switches_to_live() -> anyhow::Result<()> {
         ]
     );
 
+    // now emit live events
+    contract.increase().send().await?.watch().await?;
+    contract.increase().send().await?.watch().await?;
+
     // chain tip reached
     assert_next!(stream, ScannerStatus::SwitchingToLive);
 
@@ -93,11 +93,6 @@ async fn block_confirmations_mitigate_reorgs() -> anyhow::Result<()> {
 
     scanner.start().await?;
 
-    // emit "live" events
-    for _ in 0..2 {
-        contract.increase().send().await?.watch().await?;
-    }
-
     // assert historic events are streamed in a batch
     assert_next!(
         stream,
@@ -106,6 +101,12 @@ async fn block_confirmations_mitigate_reorgs() -> anyhow::Result<()> {
             TestCounter::CountIncreased { newCount: U256::from(2) }
         ]
     );
+
+    // emit "live" events
+    for _ in 0..2 {
+        contract.increase().send().await?.watch().await?;
+    }
+
     // switching to "live" phase
     assert_next!(stream, ScannerStatus::SwitchingToLive);
     // assert confirmed live events are streamed separately