fix: fix add_path func leaf determination
This commit is contained in:
parent
ebf71c2dc7
commit
55cc71dadf
2 changed files with 8 additions and 7 deletions
|
@ -213,19 +213,17 @@ impl PartialMerkleTree {
|
||||||
// insert calculated node to the nodes map
|
// insert calculated node to the nodes map
|
||||||
self.nodes.insert(index_value, node);
|
self.nodes.insert(index_value, node);
|
||||||
|
|
||||||
|
// if the calculated node was a leaf, remove it from leaves set.
|
||||||
|
if self.leaves.contains(&index_value) {
|
||||||
|
self.leaves.remove(&index_value);
|
||||||
|
}
|
||||||
|
|
||||||
let sibling_node = index_value.sibling();
|
let sibling_node = index_value.sibling();
|
||||||
// node became a leaf only if it is a new node (it wasn't in nodes map)
|
// node became a leaf only if it is a new node (it wasn't in nodes map)
|
||||||
if !self.nodes.contains_key(&sibling_node) {
|
if !self.nodes.contains_key(&sibling_node) {
|
||||||
self.leaves.insert(sibling_node);
|
self.leaves.insert(sibling_node);
|
||||||
}
|
}
|
||||||
|
|
||||||
// node stops being a leaf if the path contains a node which is a child of this leaf
|
|
||||||
let mut parent = index_value;
|
|
||||||
parent.move_up();
|
|
||||||
if self.leaves.contains(&parent) {
|
|
||||||
self.leaves.remove(&parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
// insert node from Merkle path to the nodes map
|
// insert node from Merkle path to the nodes map
|
||||||
self.nodes.insert(sibling_node, hash.into());
|
self.nodes.insert(sibling_node, hash.into());
|
||||||
|
|
||||||
|
|
|
@ -133,6 +133,9 @@ fn check_leaf_depth() {
|
||||||
assert_eq!(pmt.get_leaf_depth(7).unwrap(), 1);
|
assert_eq!(pmt.get_leaf_depth(7).unwrap(), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: add test for add_path function and check correctness of leaf determination (requires
|
||||||
|
// inner_nodes iter)
|
||||||
|
|
||||||
// HELPER FUNCTIONS
|
// HELPER FUNCTIONS
|
||||||
// --------------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue