fix conflicts

Author: 0xNeshi

examples/historical_scanning/main.rs

@@ -4,11 +4,14 @@ use alloy::{
     eips::BlockNumberOrTag, network::Ethereum, providers::ProviderBuilder, sol, sol_types::SolEvent,
 };
 use alloy_node_bindings::Anvil;
-use event_scanner::{EventFilter, event_scanner::EventScanner};
+use event_scanner::{
+    EventFilter,
+    event_scanner::{EventScanner, EventScannerMessage},
+};
 
 use tokio::time::sleep;
 use tokio_stream::StreamExt;
-use tracing::info;
+use tracing::{error, info};
 use tracing_subscriber::EnvFilter;
 
 sol! {
@@ -61,9 +64,19 @@ async fn main() -> anyhow::Result<()> {
     sleep(Duration::from_secs(10)).await;
     client.start_scanner(BlockNumberOrTag::Number(0), None).await.expect("failed to start scanner");
 
-    while let Some(Ok(logs)) = stream.next().await {
-        for log in logs {
-            info!("Callback successfully executed with event {:?}", log.inner.data);
+    while let Some(message) = stream.next().await {
+        match message {
+            EventScannerMessage::Data(logs) => {
+                for log in logs {
+                    info!("Callback successfully executed with event {:?}", log.inner.data);
+                }
+            }
+            EventScannerMessage::Error(e) => {
+                error!("Received error: {}", e);
+            }
+            EventScannerMessage::Status(info) => {
+                info!("Received info: {:?}", info);
+            }
         }
     }
 

examples/simple_counter/main.rs

@@ -4,11 +4,14 @@ use alloy::{
     eips::BlockNumberOrTag, network::Ethereum, providers::ProviderBuilder, sol, sol_types::SolEvent,
 };
 use alloy_node_bindings::Anvil;
-use event_scanner::{EventFilter, event_scanner::EventScanner};
+use event_scanner::{
+    EventFilter,
+    event_scanner::{EventScanner, EventScannerMessage},
+};
 
 use tokio::time::sleep;
 use tokio_stream::StreamExt;
-use tracing::info;
+use tracing::{error, info};
 use tracing_subscriber::EnvFilter;
 
 sol! {
@@ -74,9 +77,19 @@ async fn main() -> anyhow::Result<()> {
         }
     });
 
-    while let Some(Ok(logs)) = stream.next().await {
-        for log in logs {
-            info!("Callback successfully executed with event {:?}", log.inner.data);
+    while let Some(message) = stream.next().await {
+        match message {
+            EventScannerMessage::Data(logs) => {
+                for log in logs {
+                    info!("Callback successfully executed with event {:?}", log.inner.data);
+                }
+            }
+            EventScannerMessage::Error(e) => {
+                error!("Received error: {}", e);
+            }
+            EventScannerMessage::Status(info) => {
+                info!("Received info: {:?}", info);
+            }
         }
     }