jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

primitives: use alloy Header struct (#10691)

Browse Source
This commit is contained in:
Thomas Coratger
2024-09-23 14:53:43 +02:00
committed by GitHub
parent 7529d36515
commit ed1de8996d
85 changed files with 826 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
crates/storage/provider/src/test_utils/mock.rs
View File

@ -18,8 +18,8 @@ use reth_db_api::models::{AccountBeforeTx, StoredBlockBodyIndices};
use reth_evm::ConfigureEvmEnv;
use reth_execution_types::{Chain, ExecutionOutcome};
use reth_primitives::{
Account, Block, BlockWithSenders, Bytecode, GotExpected, Header, Receipt, SealedBlock,
SealedBlockWithSenders, SealedHeader, TransactionMeta, TransactionSigned,
alloy_primitives::Sealable, Account, Block, BlockWithSenders, Bytecode, GotExpected, Header,
Receipt, SealedBlock, SealedBlockWithSenders, SealedHeader, TransactionMeta, TransactionSigned,
TransactionSignedNoHash, Withdrawal, Withdrawals,
};
use reth_stages_types::{StageCheckpoint, StageId};
@ -200,7 +200,11 @@ impl HeaderProvider for MockEthProvider {
}
fn sealed_header(&self, number: BlockNumber) -> ProviderResult<Option<SealedHeader>> {
Ok(self.header_by_number(number)?.map(|h| h.seal_slow()))
Ok(self.header_by_number(number)?.map(|h| {
let sealed = h.seal_slow();
let (header, seal) = sealed.into_parts();
SealedHeader::new(header, seal)
}))
}
fn sealed_headers_while(
@ -211,7 +215,11 @@ impl HeaderProvider for MockEthProvider {
Ok(self
.headers_range(range)?
.into_iter()
.map(|h| h.seal_slow())
.map(|h| {
let sealed = h.seal_slow();
let (header, seal) = sealed.into_parts();
SealedHeader::new(header, seal)
})
.take_while(|h| predicate(h))
.collect())
}
@ -279,8 +287,14 @@ impl TransactionsProvider for MockEthProvider {
index: index as u64,
block_hash: *block_hash,
block_number: block.header.number,
base_fee: block.header.base_fee_per_gas,
excess_blob_gas: block.header.excess_blob_gas,
base_fee: block
.header
.base_fee_per_gas
.map(|base_fer_per_gas| base_fer_per_gas as u64),
excess_blob_gas: block
.header
.excess_blob_gas
.map(|excess_blob_gas| excess_blob_gas as u64),
timestamp: block.header.timestamp,
};
return Ok(Some((tx.clone(), meta)))
@ -550,7 +564,14 @@ impl BlockReaderIdExt for MockEthProvider {
}
fn sealed_header_by_id(&self, id: BlockId) -> ProviderResult<Option<SealedHeader>> {
self.header_by_id(id)?.map_or_else(|| Ok(None), |h| Ok(Some(h.seal_slow())))
self.header_by_id(id)?.map_or_else(
|| Ok(None),
|h| {
let sealed = h.seal_slow();
let (header, seal) = sealed.into_parts();
Ok(Some(SealedHeader::new(header, seal)))
},
)
}
fn header_by_id(&self, id: BlockId) -> ProviderResult<Option<Header>> {