Skip to content

block scanner ::start accepts ref to self #16

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
LeoPatOZ merged 1 commit into from
Sep 12, 2025
Merged

block scanner ::start accepts ref to self #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 7 additions & 32 deletions src/block_scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,8 @@ impl<N: Network> BlockScannerBuilder<N> {
where
P: Provider<N>,
{
let (sender, receiver) = mpsc::channel(self.blocks_read_per_epoch);

BlockScanner {
provider,
sender,
receiver,
current: Header::default(),
is_end: false,
blocks_read_per_epoch: self.blocks_read_per_epoch,
Expand All @@ -189,8 +185,6 @@ impl<N: Network> BlockScannerBuilder<N> {
// with the awareness of reorganization.
pub struct BlockScanner<P: Provider<N>, N: Network> {
provider: P,
sender: Sender<Result<N::BlockResponse, BlockScannerError>>,
receiver: Receiver<Result<N::BlockResponse, BlockScannerError>>,
blocks_read_per_epoch: usize,
start_height: BlockNumberOrTag,
end_height: BlockNumberOrTag,
Expand All @@ -208,14 +202,16 @@ where
P: Provider<N>,
N: Network,
{
pub async fn start(self) -> ReceiverStream<Result<N::BlockResponse, BlockScannerError>> {
let receiver_stream = ReceiverStream::new(self.receiver);
pub async fn start(&self) -> ReceiverStream<Result<N::BlockResponse, BlockScannerError>> {
let (sender, receiver) = mpsc::channel(self.blocks_read_per_epoch);

let receiver_stream = ReceiverStream::new(receiver);

future::ready(()).await;

tokio::spawn(async move {
if self.sender.send(Err(BlockScannerError::ErrEOF {})).await.is_err() {}
});
tokio::spawn(
async move { if sender.send(Err(BlockScannerError::ErrEOF {})).await.is_err() {} },
);

receiver_stream
}
Expand Down Expand Up @@ -293,25 +289,4 @@ mod tests {
other => panic!("expected first stream item to be ErrEOF, got: {other:?}"),
}
}

#[tokio::test]
async fn test_channel_buffer_is_equal_to_blocks_read_per_epoch() {
let anvil = Anvil::new().try_spawn().expect("failed to spawn anvil");
let ws = WsConnect::new(anvil.ws_endpoint_url());

let mut builder = BlockScannerBuilder::<Ethereum>::new();
builder.with_blocks_read_per_epoch(5);

let scanner = builder.connect_ws(ws).await.expect("failed to connect ws");

for _ in 0..scanner.blocks_read_per_epoch {
scanner
.sender
.try_send(Err(BlockScannerError::ErrContinue))
.expect("channel should not be full yet");
}

let res = scanner.sender.try_send(Err(BlockScannerError::ErrContinue));
assert!(matches!(res, Err(tokio::sync::mpsc::error::TrySendError::Full(_))));
}
}
2 changes: 2 additions & 0 deletions src/event_scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,5 @@ impl<P: Provider<N>, N: Network> EventScanner<P, N> {
todo!()
}
}

// TODO: implement max channel buffer size test