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

cargo fmt

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
zcash_history/examples/lib/main.rs
View File

@@ -1,4 +1,2 @@
// dummy example
pub fn main() {
}
pub fn main() {}

40
zcash_history/examples/lib/shared.rs
View File

@@ -1,4 +1,4 @@
use zcash_history:: {NodeData, Tree, Entry, EntryLink};
use zcash_history::{Entry, EntryLink, NodeData, Tree};
pub struct NodeDataIterator {
return_stack: Vec<NodeData>,
@@ -22,11 +22,20 @@ impl Iterator for NodeDataIterator {
} else if self.return_stack.len() > 0 {
self.return_stack.pop()
} else {
for n_append in
self.tree.append_leaf(leaf(self.leaf_cursor as u32))
.expect("full tree cannot fail").into_iter().rev()
for n_append in self
.tree
.append_leaf(leaf(self.leaf_cursor as u32))
.expect("full tree cannot fail")
.into_iter()
.rev()
{
self.return_stack.push(self.tree.resolve_link(n_append).expect("just pushed").data().clone())
self.return_stack.push(
self.tree
.resolve_link(n_append)
.expect("just pushed")
.data()
.clone(),
)
}
self.leaf_cursor += 1;
self.return_stack.pop()
@@ -42,14 +51,13 @@ impl NodeDataIterator {
let root = Entry::new(
NodeData::combine(&leaf(1), &leaf(2)),
EntryLink::Stored(0),
EntryLink::Stored(1)
EntryLink::Stored(1),
);
let tree = Tree::new(
3,
vec![(2, root)],
vec![(0, leaf(1).into()), (1, leaf(2).into())],
);
let tree =
Tree::new(
3,
vec![(2, root)],
vec![(0, leaf(1).into()), (1, leaf(2).into())]
);
NodeDataIterator {
return_stack: Vec::new(),
@@ -64,10 +72,10 @@ fn leaf(height: u32) -> NodeData {
NodeData {
consensus_branch_id: 0,
subtree_commitment: [0u8; 32],
start_time: height*10+1,
end_time: (height+1)*10,
start_target: 100 + height*10,
end_target: 100 + (height+1)*10,
start_time: height * 10 + 1,
end_time: (height + 1) * 10,
start_target: 100 + height * 10,
end_target: 100 + (height + 1) * 10,
start_sapling_root: [0u8; 32],
end_sapling_root: [0u8; 32],
subtree_total_work: 0.into(),

40
zcash_history/examples/long.rs
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()
);
}

19
zcash_history/examples/write.rs
View File

@@ -1,4 +1,4 @@
#[path= "lib/shared.rs"]
#[path = "lib/shared.rs"]
mod share;
// Test data generator
@@ -11,10 +11,14 @@ fn main() {
let mut args = std::env::args().skip(1);
let (number, out_file) = match args.next() {
None => { eprintln!("writer <number of nodes> [<out_file>]"); std::process::exit(1); },
Some(number) => {
(number.parse::<usize>().expect("invalid number"), args.next())
None => {
eprintln!("writer <number of nodes> [<out_file>]");
std::process::exit(1);
}
Some(number) => (
number.parse::<usize>().expect("invalid number"),
args.next(),
),
};
let iterator = share::NodeDataIterator::new().take(number);
@@ -24,12 +28,11 @@ fn main() {
let mut buf = Vec::new();
for node in iterator{
for node in iterator {
node.write(&mut buf).expect("Failed to write data");
}
let mut file = std::fs::File::create(&out_file_path)
.expect("Failed to create output file");
let mut file = std::fs::File::create(&out_file_path).expect("Failed to create output file");
file.write_all(&buf[..])
.expect("Failed to write data to file");
@@ -38,4 +41,4 @@ fn main() {
println!("{:?}", n);
}
}
}
}