ref: move all imports to nested in robust_provider

Author: LeoPatOZ

src/block_range_scanner.rs

@@ -67,9 +67,12 @@ use tokio::{
 use tokio_stream::{StreamExt, wrappers::ReceiverStream};
 
 use crate::{
-    IntoRobustProvider, RobustProvider, ScannerMessage,
+    ScannerMessage,
     error::ScannerError,
-    robust_provider::Error as RobustProviderError,
+    robust_provider::{
+        Error as RobustProviderError, provider::RobustProvider,
+        provider_conversion::IntoRobustProvider,
+    },
     types::{ScannerStatus, TryStream},
 };
 use alloy::{

src/event_scanner/scanner/common.rs

@@ -1,10 +1,9 @@
 use std::ops::RangeInclusive;
 
 use crate::{
-    RobustProvider,
     block_range_scanner::{MAX_BUFFERED_MESSAGES, Message as BlockRangeMessage},
     event_scanner::{filter::EventFilter, listener::EventListener},
-    robust_provider::Error as RobustProviderError,
+    robust_provider::{Error as RobustProviderError, RobustProvider},
     types::TryStream,
 };
 use alloy::{

src/event_scanner/scanner/mod.rs

@@ -6,12 +6,13 @@ use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 
 use crate::{
-    EventFilter, IntoRobustProvider, Message, ScannerError,
+    EventFilter, Message, ScannerError,
     block_range_scanner::{
         BlockRangeScanner, ConnectedBlockRangeScanner, DEFAULT_BLOCK_CONFIRMATIONS,
         MAX_BUFFERED_MESSAGES,
     },
     event_scanner::listener::EventListener,
+    robust_provider::provider_conversion::IntoRobustProvider,
 };
 
 mod common;

src/lib.rs

@@ -15,5 +15,3 @@ pub use event_scanner::{
     EventFilter, EventScanner, EventScannerBuilder, Historic, LatestEvents, Live, Message,
     SyncFromBlock, SyncFromLatestEvents,
 };
-
-pub use robust_provider::{provider::RobustProvider, provider_conversion::IntoRobustProvider};

src/robust_provider/builder.rs

@@ -2,10 +2,7 @@ use std::{marker::PhantomData, time::Duration};
 
 use alloy::{network::Network, providers::Provider};
 
-use crate::{
-    RobustProvider,
-    robust_provider::{error::Error, provider_conversion::IntoProvider},
-};
+use crate::robust_provider::{Error, IntoProvider, RobustProvider};
 
 // RPC retry and timeout settings
 /// Default timeout used by `RobustProvider`

src/robust_provider/mod.rs

@@ -3,4 +3,7 @@ pub mod error;
 pub mod provider;
 pub mod provider_conversion;
 
+pub use builder::RobustProviderBuilder;
 pub use error::Error;
+pub use provider::RobustProvider;
+pub use provider_conversion::IntoProvider;

src/robust_provider/provider_conversion.rs

@@ -8,10 +8,7 @@ use alloy::{
     transports::http::reqwest::Url,
 };
 
-use crate::{
-    RobustProvider,
-    robust_provider::{Error, builder::RobustProviderBuilder},
-};
+use crate::robust_provider::{Error, RobustProvider, RobustProviderBuilder};
 
 pub trait IntoProvider<N: Network = Ethereum> {
     fn into_provider(

tests/common/mod.rs

@@ -5,7 +5,7 @@
 pub mod setup_scanner;
 pub mod test_counter;
 
-use event_scanner::{RobustProvider, robust_provider::builder::RobustProviderBuilder};
+use event_scanner::robust_provider::{RobustProvider, RobustProviderBuilder};
 pub(crate) use setup_scanner::{
     LiveScannerSetup, SyncScannerSetup, setup_common, setup_historic_scanner, setup_latest_scanner,
     setup_live_scanner, setup_sync_from_latest_scanner, setup_sync_scanner,

tests/common/setup_scanner.rs

@@ -7,7 +7,7 @@ use alloy::{
 use alloy_node_bindings::AnvilInstance;
 use event_scanner::{
     EventFilter, EventScanner, EventScannerBuilder, Historic, LatestEvents, Live, Message,
-    RobustProvider, SyncFromBlock, SyncFromLatestEvents,
+    SyncFromBlock, SyncFromLatestEvents, robust_provider::RobustProvider,
 };
 use tokio_stream::wrappers::ReceiverStream;