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): Stage Decoupling #88

Merged
merged 6 commits into from
Apr 5, 2024
Merged

fix(derive): Stage Decoupling #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db7f575
fix(derive): l1 retrieval provider
refcell Apr 4, 2024
e5992af
fix(derive): decouple stages using provider traits
refcell Apr 4, 2024
c0efec0
fix(derive): use mock providers in stage unit tests
refcell Apr 4, 2024
176a60c
fix(derive): channel reader tests
refcell Apr 4, 2024
a2222c3
fix(derive): start batch queue tests
refcell Apr 4, 2024
186ebce
fix(derive): missing origin test
refcell Apr 4, 2024
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
16 changes: 9 additions & 7 deletions crates/derive/src/stages/attributes_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ mod tests {
RollupConfig, SingleBatch, StageError, StageResult,
};
use crate::{
stages::test_utils::{new_mock_batch_queue, MockAttributesBuilder, MockBatchQueue},
stages::test_utils::{
new_attributes_provider, MockAttributesBuilder, MockAttributesProvider,
},
traits::test_utils::TestTelemetry,
types::RawTransaction,
};
Expand All @@ -191,10 +193,10 @@ mod tests {
cfg: Option<RollupConfig>,
origin: Option<BlockInfo>,
batches: Vec<StageResult<SingleBatch>>,
) -> AttributesQueue<MockBatchQueue, TestTelemetry, MockAttributesBuilder> {
) -> AttributesQueue<MockAttributesProvider, TestTelemetry, MockAttributesBuilder> {
let cfg = cfg.unwrap_or_default();
let telemetry = TestTelemetry::new();
let mock_batch_queue = new_mock_batch_queue(origin, batches);
let mock_batch_queue = new_attributes_provider(origin, batches);
let mock_attributes_builder = MockAttributesBuilder::default();
AttributesQueue::new(cfg, mock_batch_queue, telemetry, mock_attributes_builder)
}
Expand Down Expand Up @@ -282,11 +284,11 @@ mod tests {
async fn test_create_next_attributes_success() {
let cfg = RollupConfig::default();
let telemetry = TestTelemetry::new();
let mock_batch_queue = new_mock_batch_queue(None, vec![]);
let mock = new_attributes_provider(None, vec![]);
let mut payload_attributes = PayloadAttributes::default();
let mock_builder =
MockAttributesBuilder { attributes: vec![Ok(payload_attributes.clone())] };
let mut aq = AttributesQueue::new(cfg, mock_batch_queue, telemetry, mock_builder);
let mut aq = AttributesQueue::new(cfg, mock, telemetry, mock_builder);
let parent = L2BlockInfo::default();
let txs = vec![RawTransaction::default(), RawTransaction::default()];
let batch = SingleBatch { transactions: txs.clone(), ..Default::default() };
Expand All @@ -309,10 +311,10 @@ mod tests {
async fn test_next_attributes_load_batch_last_in_span() {
let cfg = RollupConfig::default();
let telemetry = TestTelemetry::new();
let mock_batch_queue = new_mock_batch_queue(None, vec![Ok(Default::default())]);
let mock = new_attributes_provider(None, vec![Ok(Default::default())]);
let mut pa = PayloadAttributes::default();
let mock_builder = MockAttributesBuilder { attributes: vec![Ok(pa.clone())] };
let mut aq = AttributesQueue::new(cfg, mock_batch_queue, telemetry, mock_builder);
let mut aq = AttributesQueue::new(cfg, mock, telemetry, mock_builder);
// If we load the batch, we should get the last in span.
// But it won't take it so it will be available in the next_attributes call.
let _ = aq.load_batch(L2BlockInfo::default()).await.unwrap();
Expand Down
Loading
Loading