Move all macros to macro module

src/lib.rs

@@ -49,12 +49,10 @@
 //! [finalized]: alloy::eips::BlockNumberOrTag::Finalized
 
 #[macro_use]
-mod logging;
+pub mod macros;
 
 pub mod block_range_scanner;
 pub mod robust_provider;
-#[cfg(any(test, feature = "test-utils"))]
-pub mod test_utils;
 
 mod error;
 mod event_scanner;

src/macros/mod.rs

@@ -0,0 +1,6 @@
+#[macro_use]
+mod logging;
+
+#[cfg(any(test, feature = "test-utils"))]
+#[macro_use]
+pub mod test_utils;

src/test_utils/macros.rs → src/macros/test_utils.rs

@@ -145,7 +145,7 @@ macro_rules! assert_event_sequence {
     ($stream: expr, &[$($event:expr),+ $(,)?], timeout = $secs: expr) => {
         let expected_options = &[$(alloy::sol_types::SolEvent::encode_log_data(&$event)),+];
 
-       $crate::test_utils::macros::assert_event_sequence(&mut $stream, expected_options, $secs).await
+       $crate::macros::test_utils::assert_event_sequence(&mut $stream, expected_options, $secs).await
     };
     // variables and non-slice expressions
     ($stream: expr, $events: expr) => {
@@ -156,7 +156,7 @@ macro_rules! assert_event_sequence {
         if expected_options.is_empty() {
             panic!("error: assert_event_sequence! called with an empty collection. Use assert_empty! macro instead to check for no pending messages.")
         }
-        $crate::test_utils::macros::assert_event_sequence(&mut $stream, expected_options.iter(), $secs).await
+        $crate::macros::test_utils::assert_event_sequence(&mut $stream, expected_options.iter(), $secs).await
     };
 }