feat: add SealedBlock in reth-primitives-traits (#13735)

This commit is contained in:
Matthias Seitz
2025-01-15 02:12:43 +01:00
committed by GitHub
parent 1267718c7e
commit 83b2fb9b41
171 changed files with 3231 additions and 2866 deletions

View File

@ -1150,12 +1150,14 @@ mod tests {
start..=start + count - 1,
BlockRangeParams { tx_count: 0..2, ..Default::default() },
);
handle.provider.extend_blocks(blocks.iter().cloned().map(|b| (b.hash(), b.unseal())));
handle
.provider
.extend_blocks(blocks.iter().cloned().map(|b| (b.hash(), b.into_block())));
let expected = blocks
.iter()
.cloned()
.map(|b| Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>())))
.map(|b| Some(ExecutionPayloadBodyV1::from_block(b.into_block())))
.collect::<Vec<_>>();
let res = api.get_payload_bodies_by_range_v1(start, count).await.unwrap();
@ -1184,7 +1186,7 @@ mod tests {
!first_missing_range.contains(&b.number) &&
!second_missing_range.contains(&b.number)
})
.map(|b| (b.hash(), b.clone().unseal())),
.map(|b| (b.hash(), b.clone().into_block())),
);
let expected = blocks
@ -1197,7 +1199,7 @@ mod tests {
if first_missing_range.contains(&b.number) {
None
} else {
Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>()))
Some(ExecutionPayloadBodyV1::from_block(b.into_block()))
}
})
.collect::<Vec<_>>();
@ -1216,7 +1218,7 @@ mod tests {
{
None
} else {
Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>()))
Some(ExecutionPayloadBodyV1::from_block(b.into_block()))
}
})
.collect::<Vec<_>>();
@ -1290,7 +1292,7 @@ mod tests {
// Add block and to provider local store and test for mismatch
handle.provider.add_block(
execution_terminal_block.hash(),
execution_terminal_block.clone().unseal(),
execution_terminal_block.clone().into_block(),
);
let res = api.exchange_transition_configuration(transition_config);
@ -1320,7 +1322,7 @@ mod tests {
terminal_block_number,
};
handle.provider.add_block(terminal_block.hash(), terminal_block.unseal());
handle.provider.add_block(terminal_block.hash(), terminal_block.into_block());
let config = api.exchange_transition_configuration(transition_config).unwrap();
assert_eq!(config, transition_config);

View File

@ -15,13 +15,17 @@ use reth_testing_utils::generators::{
};
fn transform_block<F: FnOnce(Block) -> Block>(src: SealedBlock, f: F) -> ExecutionPayload {
let unsealed = src.unseal();
let unsealed = src.into_block();
let mut transformed: Block = f(unsealed);
// Recalculate roots
transformed.header.transactions_root =
proofs::calculate_transaction_root(&transformed.body.transactions);
transformed.header.ommers_hash = proofs::calculate_ommers_root(&transformed.body.ommers);
block_to_payload(SealedBlock::new(SealedHeader::seal(transformed.header), transformed.body)).0
block_to_payload(SealedBlock::from_sealed_parts(
SealedHeader::seal_slow(transformed.header),
transformed.body,
))
.0
}
#[test]
@ -33,7 +37,7 @@ fn payload_body_roundtrip() {
BlockRangeParams { tx_count: 0..2, ..Default::default() },
) {
let payload_body: ExecutionPayloadBodyV1 =
ExecutionPayloadBodyV1::from_block(block.clone().unseal::<Block>());
ExecutionPayloadBodyV1::from_block(block.clone().into_block());
assert_eq!(
Ok(block.body().transactions.clone()),