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: use hash fn directly (#13379)

Browse Source
This commit is contained in:
Matthias Seitz
2024-12-13 13:28:48 +01:00
committed by GitHub
parent fb649977a1
commit f347977765
5 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/blockchain-tree/src/blockchain_tree.rs
View File

@ -698,21 +698,17 @@ where
if let Err(e) =
self.externals.consensus.validate_header_with_total_difficulty(block, U256::MAX)
{
error!(
?block,
"Failed to validate total difficulty for block {}: {e}",
block.header.hash()
);
error!(?block, "Failed to validate total difficulty for block {}: {e}", block.hash());
return Err(e);
}
if let Err(e) = self.externals.consensus.validate_header(block) {
error!(?block, "Failed to validate header {}: {e}", block.header.hash());
error!(?block, "Failed to validate header {}: {e}", block.hash());
return Err(e);
}
if let Err(e) = self.externals.consensus.validate_block_pre_execution(block) {
error!(?block, "Failed to validate block {}: {e}", block.header.hash());
error!(?block, "Failed to validate block {}: {e}", block.hash());
return Err(e);
}

2
crates/blockchain-tree/src/state.rs
View File

@ -377,7 +377,7 @@ mod tests {
// Test lowest_buffered_ancestor for the descendant block
let lowest_ancestor = tree_state.lowest_buffered_ancestor(&descendant_hash);
assert!(lowest_ancestor.is_some());
assert_eq!(lowest_ancestor.unwrap().block.header.hash(), ancestor_hash);
assert_eq!(lowest_ancestor.unwrap().block.hash(), ancestor_hash);
// Test lowest_buffered_ancestor with a non-existent hash
let non_existent_hash = B256::random();

8
crates/engine/tree/src/tree/mod.rs
View File

@ -1762,18 +1762,18 @@ where
target: "engine::tree",
?block,
"Failed to validate total difficulty for block {}: {e}",
block.header.hash()
block.hash()
);
return Err(e)
}
if let Err(e) = self.consensus.validate_header(block) {
error!(target: "engine::tree", ?block, "Failed to validate header {}: {e}", block.header.hash());
error!(target: "engine::tree", ?block, "Failed to validate header {}: {e}", block.hash());
return Err(e)
}
if let Err(e) = self.consensus.validate_block_pre_execution(block) {
error!(target: "engine::tree", ?block, "Failed to validate block {}: {e}", block.header.hash());
error!(target: "engine::tree", ?block, "Failed to validate block {}: {e}", block.hash());
return Err(e)
}
@ -2210,7 +2210,7 @@ where
))
})?;
if let Err(e) = self.consensus.validate_header_against_parent(&block, &parent_block) {
warn!(target: "engine::tree", ?block, "Failed to validate header {} against parent: {e}", block.header.hash());
warn!(target: "engine::tree", ?block, "Failed to validate header {} against parent: {e}", block.hash());
return Err(e.into())
}

2
crates/rpc/rpc-eth-api/src/helpers/call.rs
View File

@ -94,7 +94,7 @@ pub trait EthCall: EstimateCall + Call + LoadPendingBlock + LoadBlock + FullEthA
let base_block =
self.block_with_senders(block).await?.ok_or(EthApiError::HeaderNotFound(block))?;
let mut parent_hash = base_block.header.hash();
let mut parent_hash = base_block.hash();
// Only enforce base fee if validation is enabled
cfg.disable_base_fee = !validation;

16
crates/storage/provider/src/providers/blockchain_provider.rs
View File

@ -1535,7 +1535,7 @@ mod tests {
let in_memory_block = in_memory_blocks.last().unwrap().clone();
let block_number = database_block.number;
let block_hash = database_block.header.hash();
let block_hash = database_block.hash();
assert_eq!(
provider.block_by_id(block_number.into()).unwrap(),
@ -1544,7 +1544,7 @@ mod tests {
assert_eq!(provider.block_by_id(block_hash.into()).unwrap(), Some(database_block.unseal()));
let block_number = in_memory_block.number;
let block_hash = in_memory_block.header.hash();
let block_hash = in_memory_block.hash();
assert_eq!(
provider.block_by_id(block_number.into()).unwrap(),
Some(in_memory_block.clone().unseal())
@ -1628,7 +1628,7 @@ mod tests {
let in_memory_block = in_memory_blocks.last().unwrap().clone();
let block_number = database_block.number;
let block_hash = database_block.header.hash();
let block_hash = database_block.hash();
assert_eq!(
provider.header_by_id(block_number.into()).unwrap(),
@ -1649,7 +1649,7 @@ mod tests {
);
let block_number = in_memory_block.number;
let block_hash = in_memory_block.header.hash();
let block_hash = in_memory_block.hash();
assert_eq!(
provider.header_by_id(block_number.into()).unwrap(),
@ -1686,7 +1686,7 @@ mod tests {
let in_memory_block = in_memory_blocks.last().unwrap().clone();
let block_number = database_block.number;
let block_hash = database_block.header.hash();
let block_hash = database_block.hash();
assert_eq!(
provider.ommers_by_id(block_number.into()).unwrap().unwrap_or_default(),
@ -1698,7 +1698,7 @@ mod tests {
);
let block_number = in_memory_block.number;
let block_hash = in_memory_block.header.hash();
let block_hash = in_memory_block.hash();
assert_eq!(
provider.ommers_by_id(block_number.into()).unwrap().unwrap_or_default(),
@ -1726,7 +1726,7 @@ mod tests {
let in_memory_block = in_memory_blocks.last().unwrap().clone();
let block_number = database_block.number;
let block_hash = database_block.header.hash();
let block_hash = database_block.hash();
assert!(!receipts.get(database_block.number as usize).unwrap().is_empty());
assert!(!provider
@ -1744,7 +1744,7 @@ mod tests {
);
let block_number = in_memory_block.number;
let block_hash = in_memory_block.header.hash();
let block_hash = in_memory_block.hash();
assert_eq!(
provider.receipts_by_block_id(block_number.into())?.unwrap(),