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

chore: make block field private (#13628)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-03 16:10:32 +01:00
committed by GitHub
parent 82013f46da
commit dbd4f0c4fe
67 changed files with 317 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/consensus/beacon/src/engine/mod.rs
View File

@ -2774,8 +2774,7 @@ mod tests {
.with_real_consensus()
.build();
let genesis =
SealedBlock { header: chain_spec.sealed_genesis_header(), ..Default::default() };
let genesis = SealedBlock::new(chain_spec.sealed_genesis_header(), Default::default());
let block1 = random_block(
&mut rng,
1,

22
crates/consensus/common/src/validation.rs
View File

@ -42,7 +42,7 @@ pub fn validate_header_base_fee<H: BlockHeader, ChainSpec: EthereumHardforks>(
pub fn validate_shanghai_withdrawals<H: BlockHeader, B: BlockBody>(
block: &SealedBlock<H, B>,
) -> Result<(), ConsensusError> {
let withdrawals = block.body.withdrawals().ok_or(ConsensusError::BodyWithdrawalsMissing)?;
let withdrawals = block.body().withdrawals().ok_or(ConsensusError::BodyWithdrawalsMissing)?;
let withdrawals_root = alloy_consensus::proofs::calculate_withdrawals_root(withdrawals);
let header_withdrawals_root =
block.withdrawals_root().ok_or(ConsensusError::WithdrawalsRootMissing)?;
@ -67,7 +67,7 @@ pub fn validate_cancun_gas<H: BlockHeader, B: BlockBody>(
// blob tx
let header_blob_gas_used =
block.header().blob_gas_used().ok_or(ConsensusError::BlobGasUsedMissing)?;
let total_blob_gas = block.body.blob_gas_used();
let total_blob_gas = block.body().blob_gas_used();
if total_blob_gas != header_blob_gas_used {
return Err(ConsensusError::BlobGasUsedDiff(GotExpected {
got: header_blob_gas_used,
@ -139,7 +139,7 @@ where
ChainSpec: EthereumHardforks,
{
// Check ommers hash
let ommers_hash = block.body.calculate_ommers_root();
let ommers_hash = block.body().calculate_ommers_root();
if Some(block.header.ommers_hash()) != ommers_hash {
return Err(ConsensusError::BodyOmmersHashDiff(
GotExpected {
@ -514,10 +514,10 @@ mod tests {
let transactions = Vec::new();
(
SealedBlock {
header: SealedHeader::seal(header),
body: BlockBody { transactions, ommers, withdrawals: None },
},
SealedBlock::new(
SealedHeader::seal(header),
BlockBody { transactions, ommers, withdrawals: None },
),
parent,
)
}
@ -539,10 +539,10 @@ mod tests {
..Default::default()
};
SealedBlock {
header: SealedHeader::seal(header),
body: BlockBody { withdrawals: Some(withdrawals), ..Default::default() },
}
SealedBlock::new(
SealedHeader::seal(header),
BlockBody { withdrawals: Some(withdrawals), ..Default::default() },
)
};
// Single withdrawal