Skip to content

Commit d0efd02

Browse files
authored
Merge pull request #1 from zhiqiangxu/mod_hash_node
remove `depth` parameter from `hash_node`
2 parents 3d5f432 + dcadfee commit d0efd02

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/subtree.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<H: NodeHasher> SubTree<H> {
5656
if self.is_empty() {
5757
return Ok(H::hash(&[]));
5858
}
59-
Self::hash_node(&self.root, 0)
59+
Self::hash_node(&self.root)
6060
}
6161

6262
#[inline(always)]
@@ -197,7 +197,7 @@ impl<H: NodeHasher> SubTree<H> {
197197
}
198198
}
199199

200-
fn hash_node(node: &SubTreeNode, depth: usize) -> Result<Hash, VerifyError> {
200+
fn hash_node(node: &SubTreeNode) -> Result<Hash, VerifyError> {
201201
match node {
202202
SubTreeNode::Leaf { key, value_or_hash } => match value_or_hash {
203203
ValueOrHash::Value(value) => {
@@ -211,9 +211,8 @@ impl<H: NodeHasher> SubTree<H> {
211211
left,
212212
right,
213213
} => {
214-
let depth = depth + prefix.bit_len() + 1;
215-
let left_hash = Self::hash_node(left, depth)?;
216-
let right_hash = Self::hash_node(right, depth)?;
214+
let left_hash = Self::hash_node(left)?;
215+
let right_hash = Self::hash_node(right)?;
217216
Ok(H::hash_internal(prefix.as_bytes(), &left_hash, &right_hash))
218217
}
219218
SubTreeNode::Hash(hash) => Ok(hash.clone()),

0 commit comments

Comments
 (0)