Qortal/pirate-librustzcash
1
0
Fork 1
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-07-30 20:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify and optimize get_peaks

Browse Source
This commit is contained in:
NikVolf
2019-09-02 18:18:33 +03:00
parent 4c49f09515
commit d58b33fb78
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/tree.rs
View File

@@ -109,12 +109,13 @@ impl Tree {
result result
} }
fn get_peaks(&self, root: NodeLink) -> Vec<NodeLink> { fn get_peaks(&self, root: NodeLink, target: &mut Vec<NodeLink>) {
let (left_child_link, right_child_link) = { let (left_child_link, right_child_link) = {
let root = self.resolve_link(root); let root = self.resolve_link(root);
if root.node.complete() { if root.node.complete() {
return vec![root.link]; target.push(root.link);
return;
} }
( (
root.node.left.expect("It would stop before when root is leaf"), root.node.left.expect("It would stop before when root is leaf"),
@@ -122,23 +123,8 @@ impl Tree {
) )
}; };
let mut result = Vec::new(); self.get_peaks(left_child_link, target);
self.get_peaks(right_child_link, target);
let left_child = self.resolve_link(left_child_link);
if left_child.node.complete() {
result.push(left_child_link);
} else {
result.extend(self.get_peaks(left_child_link));
}
let right_child = self.resolve_link(right_child_link);
if right_child.node.complete() {
result.push(right_child_link);
} else {
result.extend(self.get_peaks(right_child_link));
}
result
} }
/// Append one leaf to the tree. /// Append one leaf to the tree.
@@ -147,7 +133,8 @@ impl Tree {
let mut appended = Vec::new(); let mut appended = Vec::new();
appended.push(new_leaf_link); appended.push(new_leaf_link);
let mut peaks = self.get_peaks(root); let mut peaks = Vec::new();
self.get_peaks(root, &mut peaks);
let mut merge_stack = Vec::new(); let mut merge_stack = Vec::new();
merge_stack.push(new_leaf_link); merge_stack.push(new_leaf_link);
@@ -181,7 +168,6 @@ impl Tree {
) )
} }
AppendTransaction { AppendTransaction {
new_root, new_root,
appended, appended,
@@ -612,7 +598,7 @@ mod tests {
} }
assert_eq!(tree.len(), 7); assert_eq!(tree.len(), 7);
root = tree.truncate_leaf(root).new_root; tree.truncate_leaf(root);
assert_eq!(tree.len(), 4); assert_eq!(tree.len(), 4);
} }