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): Rebase span batch validation tests #125

Merged
merged 1 commit into from
Apr 19, 2024
Merged

fix(derive): Rebase span batch validation tests #125

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
42 changes: 27 additions & 15 deletions crates/derive/src/types/batch/span_batch/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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() };
Expand Down Expand Up @@ -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![] };
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading