move errors to own file

Author: LeoPatOZ

src/event_lib/error.rs

@@ -0,0 +1,20 @@
+use std::sync::Arc;
+
+use alloy::transports::{RpcError, TransportErrorKind};
+use thiserror::Error;
+
+use crate::block_range_scanner::BlockRangeScannerError;
+
+#[derive(Error, Debug, Clone)]
+pub enum EventScannerError {
+    #[error("Block range scanner error: {0}")]
+    BlockRangeScanner(#[from] BlockRangeScannerError),
+    #[error("Provider error: {0}")]
+    Provider(Arc<RpcError<TransportErrorKind>>),
+}
+
+impl From<RpcError<TransportErrorKind>> for EventScannerError {
+    fn from(e: RpcError<TransportErrorKind>) -> Self {
+        EventScannerError::Provider(Arc::new(e))
+    }
+}

src/event_lib/mod.rs

@@ -1,12 +1,14 @@
+pub mod error;
 pub mod filter;
 pub mod listener;
 pub mod modes;
 pub mod scanner;
 
+pub use error::EventScannerError;
 pub use filter::EventFilter;
 pub use listener::EventListener;
 pub use modes::{
     EventScanner, HistoricEventScanner, HistoricScannerConfig, LiveEventScanner, LiveScannerConfig,
     SyncEventScanner, SyncScannerConfig,
 };
-pub use scanner::{EventScannerError, EventScannerMessage, EventScannerService};
+pub use scanner::{EventScannerMessage, EventScannerService};

src/event_lib/modes/historic.rs

@@ -9,7 +9,8 @@ use tokio_stream::wrappers::ReceiverStream;
 
 use crate::event_lib::{
     filter::EventFilter,
-    scanner::{EventScannerError, EventScannerMessage, EventScannerService},
+    EventScannerError,
+    scanner::{EventScannerMessage, EventScannerService},
 };
 
 use super::{BaseConfig, BaseConfigBuilder};

src/event_lib/modes/latest.rs

@@ -11,7 +11,8 @@ use crate::{
     block_range_scanner::DEFAULT_BLOCK_CONFIRMATIONS,
     event_lib::{
         filter::EventFilter,
-        scanner::{EventScannerError, EventScannerMessage, EventScannerService},
+        EventScannerError,
+        scanner::{EventScannerMessage, EventScannerService},
     },
 };
 

src/event_lib/modes/live.rs

@@ -10,7 +10,8 @@ use crate::{
     block_range_scanner::DEFAULT_BLOCK_CONFIRMATIONS,
     event_lib::{
         filter::EventFilter,
-        scanner::{EventScannerError, EventScannerMessage, EventScannerService},
+        EventScannerError,
+        scanner::{EventScannerMessage, EventScannerService},
     },
 };
 

src/event_lib/modes/sync.rs

@@ -11,7 +11,8 @@ use crate::{
     block_range_scanner::DEFAULT_BLOCK_CONFIRMATIONS,
     event_lib::{
         filter::EventFilter,
-        scanner::{EventScannerError, EventScannerMessage, EventScannerService},
+        EventScannerError,
+        scanner::{EventScannerMessage, EventScannerService},
     },
 };
 

src/event_lib/scanner.rs

@@ -1,6 +1,7 @@
-use std::{ops::RangeInclusive, sync::Arc};
+use std::ops::RangeInclusive;
 
 use crate::{
+    EventScannerError,
     block_range_scanner::{
         BlockRangeMessage, BlockRangeScannerError, ConnectedBlockRangeScanner,
         MAX_BUFFERED_MESSAGES,
@@ -13,9 +14,7 @@ use alloy::{
     network::Network,
     providers::{Provider, RootProvider},
     rpc::types::{Filter, Log},
-    transports::{RpcError, TransportErrorKind},
 };
-use thiserror::Error;
 use tokio::sync::{
     broadcast::{self, Sender, error::RecvError},
     mpsc,
@@ -25,20 +24,6 @@ use tracing::{error, info};
 
 pub type EventScannerMessage = ScannerMessage<Vec<Log>, EventScannerError>;
 
-#[derive(Error, Debug, Clone)]
-pub enum EventScannerError {
-    #[error("Block range scanner error: {0}")]
-    BlockRangeScanner(#[from] BlockRangeScannerError),
-    #[error("Provider error: {0}")]
-    Provider(Arc<RpcError<TransportErrorKind>>),
-}
-
-impl From<RpcError<TransportErrorKind>> for EventScannerError {
-    fn from(e: RpcError<TransportErrorKind>) -> Self {
-        EventScannerError::Provider(Arc::new(e))
-    }
-}
-
 pub struct EventScannerService<N: Network> {
     block_range_scanner: ConnectedBlockRangeScanner<N>,
     event_listeners: Vec<EventListener>,