Skip to content

Commit 14ccd64

Browse files
committed
test: add test_l1_sync_batch_finalized
1 parent 82d4178 commit 14ccd64

File tree

8 files changed

+218
-513
lines changed

8 files changed

+218
-513
lines changed

crates/node/src/args.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -356,19 +356,15 @@ impl ScrollRollupNodeConfig {
356356
.filter(|_| !self.test_args.test || self.blob_provider_args.anvil_url.is_some())
357357
{
358358
tracing::info!(target: "scroll::node::args", ?l1_block_startup_info, "Starting L1 watcher");
359-
(
360-
None,
361-
Some(
362-
L1Watcher::spawn(
363-
provider,
364-
l1_block_startup_info,
365-
node_config,
366-
self.l1_provider_args.logs_query_block_range,
367-
self.test_args.test && self.test_args.skip_l1_synced,
368-
)
369-
.await,
370-
),
371-
)
359+
let (tx, rx) = L1Watcher::spawn(
360+
provider,
361+
l1_block_startup_info,
362+
node_config,
363+
self.l1_provider_args.logs_query_block_range,
364+
self.test_args.test && self.test_args.skip_l1_synced,
365+
)
366+
.await;
367+
(Some(tx), Some(rx))
372368
} else {
373369
// Create a channel for L1 notifications that we can use to inject L1 messages for
374370
// testing

crates/node/src/test_utils/event_utils.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,15 @@ impl<'a> EventWaiter<'a> {
143143
Ok(())
144144
}
145145

146+
/// Wait for batch finalized event on all specified nodes.
147+
pub async fn batch_finalized(self) -> eyre::Result<()> {
148+
self.wait_for_event_on_all(|e| {
149+
matches!(e, ChainOrchestratorEvent::BatchFinalized { .. }).then_some(())
150+
})
151+
.await?;
152+
Ok(())
153+
}
154+
146155
/// Wait for batch reverted event on all specified nodes.
147156
pub async fn batch_reverted(self) -> eyre::Result<()> {
148157
self.wait_for_event_on_all(|e| {

0 commit comments

Comments
 (0)