Revert "test: implement assert_event_sequence"

This reverts commit 5c095cf.

Author: 0xNeshi

src/test_utils/macros.rs

@@ -19,47 +19,23 @@ macro_rules! assert_next {
 }
 
 #[macro_export]
-macro_rules! assert_event_sequence {
+macro_rules! assert_next_any {
     ($stream: expr, $expected_options: expr) => {
-        assert_event_sequence!($stream, $expected_options, timeout = 5)
+        assert_next_any!($stream, $expected_options, timeout = 5)
     };
     ($stream: expr, $expected_options: expr, timeout = $secs: expr) => {
-        let expected_options = $expected_options;
-        if expected_options.is_empty() {
-            panic!("assert_event_sequence! called with empty array. Use assert_empty! macro instead to check for no pending messages.");
-        }
-
-        let mut remaining = expected_options.iter();
-        let start = std::time::Instant::now();
-        let timeout_duration = std::time::Duration::from_secs($secs);
-
-        while let Some(expected) = remaining.next() {
-            let elapsed = start.elapsed();
-            if elapsed >= timeout_duration {
-                panic!("Timed out waiting for events. Still expecting: {:#?}", remaining);
-            }
-
-            let time_left = timeout_duration - elapsed;
-            let message =
-                tokio::time::timeout(time_left, tokio_stream::StreamExt::next(&mut $stream))
-                    .await
-                    .expect("timed out waiting for next batch");
+        let message = tokio::time::timeout(
+            std::time::Duration::from_secs($secs),
+            tokio_stream::StreamExt::next(&mut $stream),
+        )
+        .await
+        .expect("timed out");
 
-            match message {
-                Some($crate::ScannerMessage::Data(batch)) => {
-                    let mut batch = batch.iter();
-                    let event = batch.next().expect("Streamed batch should not be empty");
-                    assert_eq!(&alloy::sol_types::SolEvent::encode_log_data(expected), event.data(), "Unexpected event: {:#?}\nExpected: {:#?}\nRemaining: {:#?}", event, expected, remaining);
-                    while let Some(event) = batch.next() {
-                        let expected = remaining.next().unwrap_or_else(|| panic!("Received more events than expected, current: {:#?}\nStreamed batch: {:#?}", event, batch));
-                        assert_eq!(&alloy::sol_types::SolEvent::encode_log_data(expected), event.data(), "Unexpected event: {:#?}\nExpected: {:#?}\nRemaining: {:#?}", event, expected, remaining);
-                    }
-                }
-                Some(other) => {
-                    panic!("Expected ScannerMessage::Data, got: {:#?}", other);
-                }
-                None => {panic!("Stream closed while still expecting: {:#?}", remaining);}
-            }
+        if let Some(data) = message {
+            let matched = $expected_options.iter().any(|expected| data == *expected);
+            assert!(matched, "Expected one of:\n{:#?}\n\nGot:\n{:#?}", $expected_options, data);
+        } else {
+            panic!("Expected one of {:?}, but channel was closed", $expected_options)
         }
     };
 }