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

dry example a bit and reduce api

Browse Source
This commit is contained in:
NikVolf
2019-09-25 09:50:59 +02:00
parent 43efdf992b
commit 443f45f430
2 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
examples/long.rs
View File

@@ -3,6 +3,22 @@ use zcash_mmr::{Entry, EntryLink, NodeData, Tree};
#[path= "lib/shared.rs"]
mod share;
fn draft(into: &mut Vec<(u32, Entry)>, vec: &Vec<NodeData>, peak_pos: usize, h: u32) {
let node_data = vec[peak_pos-1].clone();
let peak: Entry = match h {
0 => node_data.into(),
_ => Entry::new(
node_data,
EntryLink::Stored((peak_pos - (1 << h) - 1) as u32),
EntryLink::Stored((peak_pos - 2) as u32),
),
};
println!("Entry #{}: {}", into.len(), peak);
into.push(((peak_pos-1) as u32, peak));
}
fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
assert!(vec.len() > 0);
@@ -25,19 +41,7 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
}
if peak_pos <= vec.len() {
let mut peak: Entry = vec[peak_pos-1].clone().into();
if h != 0 {
let left_idx = (peak_pos - (1<<h) - 1) as u32;
let right_idx = (peak_pos - 2) as u32;
peak.update_siblings(
EntryLink::Stored(left_idx),
EntryLink::Stored(right_idx),
);
println!("Peak #{}: ({}, {})", nodes.len(), left_idx, right_idx);
}
nodes.push(((peak_pos-1) as u32, peak));
draft(&mut nodes, vec, peak_pos, h);
// save to be used in next loop
last_peak_pos = peak_pos;
@@ -63,30 +67,10 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
h = h - 1;
// drafting left child
let mut peak: Entry = vec[left_pos-1].clone().into();
if h != 0 {
let left_idx = (left_pos - (1<<h) - 1) as u32;
let right_idx = (left_pos - 2) as u32;
peak.update_siblings(
EntryLink::Stored(left_idx),
EntryLink::Stored(right_idx),
);
}
extra.push(((left_pos-1) as u32, peak));
draft(&mut extra, vec, left_pos, h);
// drafting right child
let mut peak: Entry = vec[right_pos-1].clone().into();
if h != 0 {
let left_idx = (right_pos - (1<<h) - 1) as u32;
let right_idx = (right_pos - 2) as u32;
peak.update_siblings(
EntryLink::Stored(left_idx),
EntryLink::Stored(right_idx),
);
}
extra.push(((right_pos-1) as u32, peak));
draft(&mut extra, vec, right_pos, h);
// continuing on right slope
peak_pos = right_pos;
@@ -94,7 +78,6 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
println!("Total extra of {} required for deletion!", extra.len());
Tree::new(vec.len() as u32, nodes, extra)
}