Skip to content
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

fix(derive): BatchStream Past batch handling #876

Merged
merged 2 commits into from
Jan 2, 2025
Merged

fix(derive): BatchStream Past batch handling #876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
348ac84
fix(derive): `BatchStream` Past batch handling
clabby Dec 22, 2024
80905bb
test
clabby Jan 2, 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
33 changes: 32 additions & 1 deletion crates/derive/src/stages/batch/batch_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ where
return Err(PipelineError::InvalidBatchValidity.crit());
}

return Err(PipelineError::Eof.temp());
return Err(PipelineError::NotEnoughData.temp());
}
BatchValidity::Undecided | BatchValidity::Future => {
return Err(PipelineError::NotEnoughData.temp())
Expand Down Expand Up @@ -225,6 +225,7 @@ mod test {
types::ResetSignal,
};
use alloc::vec;
use alloy_eips::NumHash;
use op_alloy_protocol::{SingleBatch, SpanBatchElement};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};

Expand Down Expand Up @@ -382,4 +383,34 @@ mod test {
assert_eq!(stream.span_buffer_size(), 0);
assert!(stream.span.is_none());
}

#[tokio::test]
async fn test_past_span_batch() {
let mock_batch = SpanBatch {
batches: vec![
SpanBatchElement { epoch_num: 1, timestamp: 2, ..Default::default() },
SpanBatchElement { epoch_num: 1, timestamp: 4, ..Default::default() },
],
..Default::default()
};
let mock_origins = [BlockInfo { number: 1, timestamp: 12, ..Default::default() }];
let data = vec![Ok(Batch::Span(mock_batch))];

let config = Arc::new(RollupConfig { holocene_time: Some(0), ..RollupConfig::default() });
let prev = TestBatchStreamProvider::new(data);
let mut stream = BatchStream::new(prev, config.clone(), TestL2ChainProvider::default());

// The stage should be active.
assert!(stream.is_active().unwrap());

let parent = L2BlockInfo {
block_info: BlockInfo { number: 10, timestamp: 100, ..Default::default() },
l1_origin: NumHash::default(),
seq_num: 0,
};

// `next_batch` should return an error if the span batch is in the past.
let err = stream.next_batch(parent, &mock_origins).await.unwrap_err();
assert_eq!(err, PipelineError::NotEnoughData.temp());
}
}
Loading