cargo fmt

This commit is contained in:
Sean Bowe
2020-03-03 18:11:44 -07:00
parent 5e1a2f9d3f
commit 46e88a5e69
9 changed files with 173 additions and 172 deletions

View File

@@ -1,10 +1,10 @@
use zcash_history::{Entry, EntryLink, NodeData, Tree};
#[path= "lib/shared.rs"]
#[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 node_data = vec[peak_pos - 1].clone();
let peak: Entry = match h {
0 => node_data.into(),
_ => Entry::new(
@@ -16,16 +16,15 @@ fn draft(into: &mut Vec<(u32, Entry)>, vec: &Vec<NodeData>, peak_pos: usize, h:
println!("Entry #{}: {}", into.len(), peak);
into.push(((peak_pos-1) as u32, peak));
into.push(((peak_pos - 1) as u32, peak));
}
fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
assert!(vec.len() > 0);
// integer log2 of (vec.len()+1), -1
let mut h = (32 - ((vec.len()+1) as u32).leading_zeros() - 1)-1;
let mut peak_pos = (1 << (h+1)) - 1;
let mut h = (32 - ((vec.len() + 1) as u32).leading_zeros() - 1) - 1;
let mut peak_pos = (1 << (h + 1)) - 1;
let mut nodes = Vec::new();
// used later
@@ -33,10 +32,9 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
let mut last_peak_h = 0;
loop {
if peak_pos > vec.len() {
// left child, -2^h
peak_pos = peak_pos - (1<<h);
peak_pos = peak_pos - (1 << h);
h = h - 1;
}
@@ -48,7 +46,7 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
last_peak_h = h;
// right sibling
peak_pos = peak_pos + (1 << (h+1)) - 1;
peak_pos = peak_pos + (1 << (h + 1)) - 1;
}
if h == 0 {
@@ -62,7 +60,7 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
let mut peak_pos = last_peak_pos;
while h > 0 {
let left_pos = peak_pos - (1<<h);
let left_pos = peak_pos - (1 << h);
let right_pos = peak_pos - 1;
h = h - 1;
@@ -82,14 +80,16 @@ fn prepare_tree(vec: &Vec<NodeData>) -> Tree {
}
fn main() {
let number= match std::env::args().skip(1).next() {
None => { eprintln!("writer <number of nodes> [<out_file>]"); std::process::exit(1); },
Some(number) => {
number.parse::<usize>().expect("invalid number")
let number = match std::env::args().skip(1).next() {
None => {
eprintln!("writer <number of nodes> [<out_file>]");
std::process::exit(1);
}
Some(number) => number.parse::<usize>().expect("invalid number"),
};
let long_vec = share::NodeDataIterator::new().take(number)
let long_vec = share::NodeDataIterator::new()
.take(number)
.collect::<Vec<NodeData>>();
let now = std::time::Instant::now();
@@ -97,13 +97,17 @@ fn main() {
let tree = prepare_tree(&long_vec);
let elapsed = now.elapsed();
println!("Tree final root: {}-{}",
println!(
"Tree final root: {}-{}",
tree.root_node().expect("root").data().start_height,
tree.root_node().expect("root").data().end_height,
);
println!("Prepare tree of {} length: {} ns / {} mcs / {} ms",
println!(
"Prepare tree of {} length: {} ns / {} mcs / {} ms",
number,
elapsed.as_nanos(), elapsed.as_micros(), elapsed.as_millis()
elapsed.as_nanos(),
elapsed.as_micros(),
elapsed.as_millis()
);
}