diff --git a/src/lib.rs b/src/lib.rs index 81afbe9b..15343f4e 100644 --- a/src/lib.rs +++ b/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; diff --git a/src/logging.rs b/src/macros/logging.rs similarity index 100% rename from src/logging.rs rename to src/macros/logging.rs diff --git a/src/macros/mod.rs b/src/macros/mod.rs new file mode 100644 index 00000000..13fb0c27 --- /dev/null +++ b/src/macros/mod.rs @@ -0,0 +1,6 @@ +#[macro_use] +mod logging; + +#[cfg(any(test, feature = "test-utils"))] +#[macro_use] +pub mod test_utils; diff --git a/src/test_utils/macros.rs b/src/macros/test_utils.rs similarity index 99% rename from src/test_utils/macros.rs rename to src/macros/test_utils.rs index 03d3187b..3164b707 100644 --- a/src/test_utils/macros.rs +++ b/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 }; } diff --git a/src/test_utils/mod.rs b/src/test_utils/mod.rs deleted file mode 100644 index eda363d6..00000000 --- a/src/test_utils/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod macros;