Skip to content

Update bs start #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xNeshi merged 4 commits into from
Sep 12, 2025
Merged

Update bs start #17

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c2f754
block scanner ::start accepts ref to self
0xNeshi Sep 12, 2025
32e9565
return range of block nums from block scanner
0xNeshi Sep 12, 2025
08fceee
merge
0xNeshi Sep 12, 2025
dd94eec
clippy
0xNeshi Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/block_scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(unused)]

use std::{future, marker::PhantomData, time::Duration};
use std::{future, marker::PhantomData, ops::Range, time::Duration};

use tokio::sync::mpsc::{self, Receiver, Sender};
use tokio_stream::wrappers::ReceiverStream;
Expand Down Expand Up @@ -57,7 +57,7 @@ pub type OnBlocksFunc<N> =
pub struct BlockScannerBuilder<N: Network> {
blocks_read_per_epoch: usize,
start_height: BlockNumberOrTag,
end_height: BlockNumberOrTag,
end_height: Option<BlockNumberOrTag>,
on_blocks: OnBlocksFunc<N>,
reorg_rewind_depth: u64,
retry_interval: Duration,
Expand All @@ -75,8 +75,8 @@ impl<N: Network> BlockScannerBuilder<N> {
pub fn new() -> Self {
Self {
blocks_read_per_epoch: DEFAULT_BLOCKS_READ_PER_EPOCH,
start_height: BlockNumberOrTag::Earliest,
end_height: BlockNumberOrTag::Latest,
start_height: BlockNumberOrTag::Latest,
end_height: None,
on_blocks: |_, _, _| Ok(()),
reorg_rewind_depth: DEFAULT_REORG_REWIND_DEPTH,
retry_interval: DEFAULT_RETRY_INTERVAL,
Expand All @@ -98,7 +98,7 @@ impl<N: Network> BlockScannerBuilder<N> {

#[must_use]
pub fn with_end_height(&mut self, end_height: BlockNumberOrTag) -> &mut Self {
self.end_height = end_height;
self.end_height = Some(end_height);
self
}

Expand Down Expand Up @@ -187,7 +187,7 @@ pub struct BlockScanner<P: Provider<N>, N: Network> {
provider: P,
blocks_read_per_epoch: usize,
start_height: BlockNumberOrTag,
end_height: BlockNumberOrTag,
end_height: Option<BlockNumberOrTag>,
current: Header,
on_blocks: OnBlocksFunc<N>,
is_end: bool,
Expand All @@ -202,7 +202,7 @@ where
P: Provider<N>,
N: Network,
{
pub async fn start(&self) -> ReceiverStream<Result<N::BlockResponse, BlockScannerError>> {
pub async fn start(&self) -> ReceiverStream<Result<Range<u64>, BlockScannerError>> {
let (sender, receiver) = mpsc::channel(self.blocks_read_per_epoch);

let receiver_stream = ReceiverStream::new(receiver);
Expand Down Expand Up @@ -247,8 +247,8 @@ mod tests {
fn test_builder_defaults() {
let builder = BlockScannerBuilder::<Ethereum>::new();
assert_eq!(builder.blocks_read_per_epoch, DEFAULT_BLOCKS_READ_PER_EPOCH);
assert!(matches!(builder.start_height, BlockNumberOrTag::Earliest));
assert!(matches!(builder.end_height, BlockNumberOrTag::Latest));
assert!(matches!(builder.start_height, BlockNumberOrTag::Latest));
assert!(builder.end_height.is_none());
assert_eq!(builder.reorg_rewind_depth, DEFAULT_REORG_REWIND_DEPTH);
assert_eq!(builder.retry_interval, DEFAULT_RETRY_INTERVAL);
assert_eq!(builder.block_confirmations, DEFAULT_BLOCK_CONFIRMATIONS);
Expand All @@ -268,7 +268,7 @@ mod tests {

assert_eq!(builder.blocks_read_per_epoch, 25);
assert!(matches!(builder.start_height, BlockNumberOrTag::Earliest));
assert!(matches!(builder.end_height, BlockNumberOrTag::Latest));
assert!(matches!(builder.end_height, Some(BlockNumberOrTag::Latest)));
assert_eq!(builder.reorg_rewind_depth, 5);
assert_eq!(builder.retry_interval, interval);
assert_eq!(builder.block_confirmations, 12);
Expand Down