fix test

Author: LeoPatOZ

src/block_range_scanner.rs

@@ -365,15 +365,12 @@ impl<N: Network> Service<N> {
         &mut self,
         block_confirmations: Option<u64>,
     ) -> Result<(), BlockRangeScannerError> {
-        let provider = self.provider.clone();
-        let latest = self.provider.get_block_number().await?;
-        let max_read_per_epoch = self.reads_per_epoch.unwrap_or(DEFAULT_BLOCKS_READ_PER_EPOCH);
-
         let Some(sender) = self.subscriber.clone() else {
             return Err(BlockRangeScannerError::ServiceShutdown);
         };
 
         let block_confirmations = block_confirmations.unwrap_or(DEFAULT_BLOCK_CONFIRMATIONS);
+        let max_read_per_epoch = self.reads_per_epoch.unwrap_or(DEFAULT_BLOCKS_READ_PER_EPOCH);
         let provider = self.provider.clone();
         let latest = self.provider.get_block_number().await?;
 
@@ -383,7 +380,14 @@ impl<N: Network> Service<N> {
         let range_start = (latest + 1).saturating_sub(block_confirmations);
 
         tokio::spawn(async move {
-            Self::stream_live_blocks(range_start, provider, sender, block_confirmations, max_read_per_epoch).await;
+            Self::stream_live_blocks(
+                range_start,
+                provider,
+                sender,
+                block_confirmations,
+                max_read_per_epoch,
+            )
+            .await;
         });
 
         Ok(())
@@ -626,7 +630,7 @@ impl<N: Network> Service<N> {
                         // NOTE: Edge case when difference between range end and range start >= max
                         // reads
                         let range_end = confirmed
-                            .min(expected_next_block.saturating_add(max_read_per_epoch as u64 - 1));
+                            .min(range_start.saturating_add(max_read_per_epoch as u64 - 1));
 
                         if sender
                             .send(BlockRangeMessage::Data(range_start..=range_end))
@@ -889,8 +893,6 @@ impl BlockRangeScannerClient {
 
 #[cfg(test)]
 mod tests {
-    use std::time::Duration;
-
     use alloy::{
         network::Ethereum,
         providers::{ProviderBuilder, ext::AnvilApi},

tests/common.rs

@@ -12,6 +12,7 @@ use alloy::{
 use alloy_node_bindings::{Anvil, AnvilInstance};
 use event_scanner::{
     EventFilter,
+    block_range_scanner::DEFAULT_BLOCKS_READ_PER_EPOCH,
     event_scanner::{EventScanner, EventScannerClient, EventScannerMessage},
 };
 use tokio_stream::wrappers::ReceiverStream;
@@ -57,7 +58,7 @@ where
 pub async fn setup_scanner(
     block_interval: Option<f64>,
     filter: Option<EventFilter>,
-    _confirmations: Option<u64>,
+    max_reads_per_epoch: Option<usize>,
 ) -> anyhow::Result<TestSetup<impl Provider<Ethereum> + Clone>> {
     let anvil = spawn_anvil(block_interval.unwrap_or(0.1))?;
     let provider = build_provider(&anvil).await?;
@@ -69,7 +70,10 @@ pub async fn setup_scanner(
 
     let filter = filter.unwrap_or(default_filter);
 
-    let mut client = EventScanner::new().connect_ws(anvil.ws_endpoint_url()).await?;
+    let mut client = EventScanner::new()
+        .with_max_block_range(max_reads_per_epoch.unwrap_or(DEFAULT_BLOCKS_READ_PER_EPOCH))
+        .connect_ws(anvil.ws_endpoint_url())
+        .await?;
 
     let stream = client.create_event_stream(filter);
 

tests/historic_to_live/reorg.rs

@@ -16,18 +16,15 @@ async fn block_confirmations_mitigate_reorgs_historic_to_live() -> anyhow::Resul
     // any reorg ≤ 5 should be invisible to consumers
     let block_confirmations = 5;
     let TestSetup { provider, contract, client, mut stream, anvil: _anvil } =
-        setup_scanner(Option::Some(1.0), Option::None, Option::Some(block_confirmations)).await?;
+        setup_scanner(Option::Some(1.0), Option::None, Option::None).await?;
 
     provider.anvil_mine(Some(10), None).await?;
 
     let start_height = provider.get_block_number().await?.saturating_sub(5);
 
     tokio::spawn(async move {
         client
-            .stream_from(
-                BlockNumberOrTag::Number(start_height),
-                Option::Some(block_confirmations),
-            )
+            .stream_from(BlockNumberOrTag::Number(start_height), Option::Some(block_confirmations))
             .await
     });
 

tests/live_mode/reorg.rs

@@ -261,7 +261,7 @@ async fn block_confirmations_mitigate_reorgs() -> anyhow::Result<()> {
     // any reorg ≤ 5 should be invisible to consumers
     let block_confirmations = 5;
     let TestSetup { provider, contract, client, mut stream, anvil: _anvil } =
-        setup_scanner(Option::Some(1.0), Option::None, Option::Some(block_confirmations)).await?;
+        setup_scanner(Option::Some(1.0), Option::None, Option::None).await?;
 
     tokio::spawn(async move { client.stream_live(Some(block_confirmations)).await });