From 876366cfd4a751a3d963d304e86b16a5b7457aaa Mon Sep 17 00:00:00 2001 From: clabby Date: Fri, 19 Apr 2024 13:43:01 -0400 Subject: [PATCH] fix(derive): Rebase span batch validation tests ## Overview Rebases the span batch validation tests on top of #123 --- .../src/types/batch/span_batch/batch.rs | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/crates/derive/src/types/batch/span_batch/batch.rs b/crates/derive/src/types/batch/span_batch/batch.rs index f8228846..ac50a064 100644 --- a/crates/derive/src/types/batch/span_batch/batch.rs +++ b/crates/derive/src/types/batch/span_batch/batch.rs @@ -733,7 +733,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -772,7 +772,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -815,7 +815,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -865,7 +865,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -914,7 +914,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -960,7 +960,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -1017,7 +1017,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 20, ..Default::default() }; let second = SpanBatchElement { epoch_num: 10, timestamp: 20, ..Default::default() }; let third = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; @@ -1067,7 +1067,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 20, transactions: vec![] }; let second = SpanBatchElement { epoch_num: 10, timestamp: 20, transactions: vec![] }; let third = SpanBatchElement { epoch_num: 11, timestamp: 20, transactions: vec![] }; @@ -1120,7 +1120,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 20, @@ -1183,7 +1183,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 20, @@ -1242,7 +1242,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let filler_bytes = RawTransaction(Bytes::copy_from_slice(&[OpTxType::Eip1559 as u8])); let first = SpanBatchElement { epoch_num: 10, @@ -1300,7 +1300,7 @@ mod tests { block_info: BlockInfo { number: 40, ..Default::default() }, ..Default::default() }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![] }; + let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], ..Default::default() }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -1354,7 +1354,11 @@ mod tests { parent_beacon_block_root: None, execution_payload: L2ExecutionPayload { block_number: 41, ..Default::default() }, }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![payload] }; + let mut fetcher = MockBlockFetcher { + blocks: vec![l2_block], + payloads: vec![payload], + ..Default::default() + }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -1418,7 +1422,11 @@ mod tests { ..Default::default() }, }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![payload] }; + let mut fetcher = MockBlockFetcher { + blocks: vec![l2_block], + payloads: vec![payload], + ..Default::default() + }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch { @@ -1479,7 +1487,11 @@ mod tests { ..Default::default() }, }; - let mut fetcher = MockBlockFetcher { blocks: vec![l2_block], payloads: vec![payload] }; + let mut fetcher = MockBlockFetcher { + blocks: vec![l2_block], + payloads: vec![payload], + ..Default::default() + }; let first = SpanBatchElement { epoch_num: 10, timestamp: 10, ..Default::default() }; let second = SpanBatchElement { epoch_num: 11, timestamp: 20, ..Default::default() }; let batch = SpanBatch {