Qortal/pirate-librustzcash
3
0
Fork 0
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-02-07 06:44:11 +00:00
Code Issues Projects Releases Wiki Activity

Clearer variable names in MMR tests

Browse Source
This commit is contained in:
Jack Grigg 2019-12-05 14:29:08 +00:00
parent edcd884fe8
commit f1619f896c
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,8 @@ struct TreeView {
extra: Vec<(u32, Entry)>, extra: Vec<(u32, Entry)>,
} }
fn draft(into: &mut Vec<(u32, Entry)>, vec: &[NodeData], peak_pos: usize, h: u32) { fn draft(into: &mut Vec<(u32, Entry)>, nodes: &[NodeData], peak_pos: usize, h: u32) {
let node_data = vec[peak_pos - 1].clone(); let node_data = nodes[peak_pos - 1].clone();
let peak: Entry = match h { let peak: Entry = match h {
0 => node_data.into(), 0 => node_data.into(),
_ => Entry::new( _ => Entry::new(
@ -24,27 +24,27 @@ fn draft(into: &mut Vec<(u32, Entry)>, vec: &[NodeData], peak_pos: usize, h: u32
into.push(((peak_pos - 1) as u32, peak)); into.push(((peak_pos - 1) as u32, peak));
} }
fn prepare_tree(vec: &[NodeData]) -> TreeView { fn prepare_tree(nodes: &[NodeData]) -> TreeView {
assert!(!vec.is_empty()); assert!(!nodes.is_empty());
// integer log2 of (vec.len()+1), -1 // integer log2 of (nodes.len()+1), -1
let mut h = (32 - ((vec.len() + 1) as u32).leading_zeros() - 1) - 1; let mut h = (32 - ((nodes.len() + 1) as u32).leading_zeros() - 1) - 1;
let mut peak_pos = (1 << (h + 1)) - 1; let mut peak_pos = (1 << (h + 1)) - 1;
let mut nodes = Vec::new(); let mut peaks = Vec::new();
// used later // used later
let mut last_peak_pos = 0; let mut last_peak_pos = 0;
let mut last_peak_h = 0; let mut last_peak_h = 0;
loop { loop {
if peak_pos > vec.len() { if peak_pos > nodes.len() {
// left child, -2^h // left child, -2^h
peak_pos -= 1 << h; peak_pos -= 1 << h;
h -= 1; h -= 1;
} }
if peak_pos <= vec.len() { if peak_pos <= nodes.len() {
draft(&mut nodes, vec, peak_pos, h); draft(&mut peaks, nodes, peak_pos, h);
// save to be used in next loop // save to be used in next loop
last_peak_pos = peak_pos; last_peak_pos = peak_pos;
@ -70,25 +70,22 @@ fn prepare_tree(vec: &[NodeData]) -> TreeView {
h -= 1; h -= 1;
// drafting left child // drafting left child
draft(&mut extra, vec, left_pos, h); draft(&mut extra, nodes, left_pos, h);
// drafting right child // drafting right child
draft(&mut extra, vec, right_pos, h); draft(&mut extra, nodes, right_pos, h);
// continuing on right slope // continuing on right slope
peak_pos = right_pos; peak_pos = right_pos;
} }
TreeView { TreeView { peaks, extra }
peaks: nodes,
extra,
}
} }
fn preload_tree_append(vec: &[NodeData]) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>) { fn preload_tree_append(nodes: &[NodeData]) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>) {
assert!(!vec.is_empty()); assert!(!nodes.is_empty());
let tree_view = prepare_tree(vec); let tree_view = prepare_tree(nodes);
let mut indices = Vec::new(); let mut indices = Vec::new();
let mut bytes = Vec::new(); let mut bytes = Vec::new();
@ -107,11 +104,11 @@ fn preload_tree_append(vec: &[NodeData]) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_E
// also returns number of peaks // also returns number of peaks
fn preload_tree_delete( fn preload_tree_delete(
vec: &[NodeData], nodes: &[NodeData],
) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>, usize) { ) -> (Vec<u32>, Vec<[u8; zcash_mmr::MAX_ENTRY_SIZE]>, usize) {
assert!(!vec.is_empty()); assert!(!nodes.is_empty());
let tree_view = prepare_tree(vec); let tree_view = prepare_tree(nodes);
let mut indices = Vec::new(); let mut indices = Vec::new();
let mut bytes = Vec::new(); let mut bytes = Vec::new();