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

Address Eirik's review comments

Browse Source
This commit is contained in:
Jack Grigg
2019-06-03 11:14:01 +01:00
parent 79006ecbdf
commit 07dbfbef59
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zcash_primitives/src/merkle_tree.rs
View File

@@ -90,10 +90,10 @@ impl<Node: Hashable> CommitmentTree<Node> {
/// Returns the number of notes in the tree.
pub fn size(&self) -> usize {
self.parents.iter().enumerate().fold(
match (self.left.is_some(), self.right.is_some()) {
(false, false) => 0,
(true, false) | (false, true) => 1,
(true, true) => 2,
match (self.left, self.right) {
(None, None) => 0,
(Some(_), None) | (None, Some(_)) => 1,
(Some(_), Some(_)) => 2,
},
|acc, (i, p)| {
// Treat occupation of parents array as a binary number

1
zcash_primitives/src/serialize.rs
View File

@@ -221,6 +221,7 @@ mod tests {
eval_u8!(Some(1), [1, 1]);
eval_u8!(Some(5), [1, 5]);
eval_vec!(None as Option<Vec<_>>, [0]);
eval_vec!(Some(vec![]), [1, 0]);
eval_vec!(Some(vec![0]), [1, 1, 0]);
eval_vec!(Some(vec![1]), [1, 1, 1]);