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(trie): use RlpNode::as_hash (#11808)

Browse Source
This commit is contained in:
Roman Krasiuk
2024-10-16 20:31:58 +02:00
committed by GitHub
parent e5cd026e03
commit dcaa432155
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/trie/sparse/src/trie.rs
View File

@ -267,8 +267,8 @@ impl RevealedSparseTrie {
// take the current prefix set.
let mut prefix_set = std::mem::take(&mut self.prefix_set).freeze();
let root_rlp = self.rlp_node(Nibbles::default(), &mut prefix_set);
if root_rlp.len() == B256::len_bytes() + 1 {
B256::from_slice(&root_rlp[1..])
if let Some(root_hash) = root_rlp.as_hash() {
root_hash
} else {
keccak256(root_rlp)
}
@ -338,8 +338,8 @@ impl RevealedSparseTrie {
} else {
let value = self.values.get(&path).unwrap();
let rlp_node = LeafNodeRef { key, value }.rlp(&mut self.rlp_buf);
if rlp_node.len() == B256::len_bytes() + 1 {
*hash = Some(B256::from_slice(&rlp_node[1..]));
if let Some(node_hash) = rlp_node.as_hash() {
*hash = Some(node_hash);
}
rlp_node
}
@ -353,8 +353,8 @@ impl RevealedSparseTrie {
let (_, child) = rlp_node_stack.pop().unwrap();
self.rlp_buf.clear();
let rlp_node = ExtensionNodeRef::new(key, &child).rlp(&mut self.rlp_buf);
if rlp_node.len() == B256::len_bytes() + 1 {
*hash = Some(B256::from_slice(&rlp_node[1..]));
if let Some(node_hash) = rlp_node.as_hash() {
*hash = Some(node_hash);
}
rlp_node
} else {
@ -393,8 +393,8 @@ impl RevealedSparseTrie {
self.rlp_buf.clear();
let rlp_node = BranchNodeRef::new(&branch_value_stack_buf, *state_mask)
.rlp(&mut self.rlp_buf);
if rlp_node.len() == B256::len_bytes() + 1 {
*hash = Some(B256::from_slice(&rlp_node[1..]));
if let Some(node_hash) = rlp_node.as_hash() {
*hash = Some(node_hash);
}
rlp_node
}