zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up remainder of MMR code

This commit is contained in:
Jack Grigg 2019-12-05 11:11:32 +00:00
parent 8ad33e50a6
commit 573510115d
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librustzcash/src/rustzcash.rs
View File

@ -1352,5 +1352,5 @@ pub extern "system" fn librustzcash_mmr_hash_node(
(*h_ret).copy_from_slice(&node.hash()[..]); (*h_ret).copy_from_slice(&node.hash()[..]);
} }
return 0; 0
} }

22
librustzcash/src/tests/mmr.rs
View File

@ -10,7 +10,7 @@ struct TreeView {
extra: Vec<(u32, Entry)>, extra: Vec<(u32, Entry)>,
} }
fn draft(into: &mut Vec<(u32, Entry)>, vec: &Vec<NodeData>, peak_pos: usize, h: u32) { fn draft(into: &mut Vec<(u32, Entry)>, 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 { let peak: Entry = match h {
0 => node_data.into(), 0 => node_data.into(),
@ -24,8 +24,8 @@ fn draft(into: &mut Vec<(u32, Entry)>, vec: &Vec<NodeData>, peak_pos: usize, h:
into.push(((peak_pos - 1) as u32, peak)); into.push(((peak_pos - 1) as u32, peak));
} }
fn prepare_tree(vec: &Vec<NodeData>) -> TreeView { fn prepare_tree(vec: &[NodeData]) -> TreeView {
assert!(vec.len() > 0); assert!(!vec.is_empty());
// integer log2 of (vec.len()+1), -1 // integer log2 of (vec.len()+1), -1
let mut h = (32 - ((vec.len() + 1) as u32).leading_zeros() - 1) - 1; let mut h = (32 - ((vec.len() + 1) as u32).leading_zeros() - 1) - 1;
@ -39,8 +39,8 @@ fn prepare_tree(vec: &Vec<NodeData>) -> TreeView {
loop { loop {
if peak_pos > vec.len() { if peak_pos > vec.len() {
// left child, -2^h // left child, -2^h
peak_pos = peak_pos - (1 << h); peak_pos -= 1 << h;
h = h - 1; h -= 1;
} }
if peak_pos <= vec.len() { if peak_pos <= vec.len() {
@ -51,7 +51,7 @@ fn prepare_tree(vec: &Vec<NodeData>) -> TreeView {
last_peak_h = h; last_peak_h = h;
// right sibling // right sibling
peak_pos = peak_pos + (1 << (h + 1)) - 1; peak_pos += (1 << (h + 1)) - 1;
} }
if h == 0 { if h == 0 {
@ -67,7 +67,7 @@ fn prepare_tree(vec: &Vec<NodeData>) -> TreeView {
while h > 0 { while h > 0 {
let left_pos = peak_pos - (1 << h); let left_pos = peak_pos - (1 << h);
let right_pos = peak_pos - 1; let right_pos = peak_pos - 1;
h = h - 1; h -= 1;
// drafting left child // drafting left child
draft(&mut extra, vec, left_pos, h); draft(&mut extra, vec, left_pos, h);
@ -85,8 +85,8 @@ fn prepare_tree(vec: &Vec<NodeData>) -> TreeView {
} }
} }
fn preload_tree_append(vec: &Vec<NodeData>) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>) { fn preload_tree_append(vec: &[NodeData]) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>) {
assert!(vec.len() > 0); assert!(!vec.is_empty());
let tree_view = prepare_tree(vec); let tree_view = prepare_tree(vec);
@ -107,9 +107,9 @@ fn preload_tree_append(vec: &Vec<NodeData>) -> (Vec<u32>, Vec<[u8; zcash_mmr::MA
// also returns number of peaks // also returns number of peaks
fn preload_tree_delete( fn preload_tree_delete(
vec: &Vec<NodeData>, vec: &[NodeData],
) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>, usize) { ) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>, usize) {
assert!(vec.len() > 0); assert!(!vec.is_empty());
let tree_view = prepare_tree(vec); let tree_view = prepare_tree(vec);