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

Update tree::MerklePath::root to be total.

This commit is contained in:
therealyingtong 2021-09-01 17:45:39 +08:00
parent 78e22f6325
commit f75f890a64
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/circuit.rs
View File

@ -944,7 +944,7 @@ mod tests {
let cv_net = ValueCommitment::derive(value.unwrap(), ValueCommitTrapdoor::zero());
let path = MerklePath::dummy(&mut rng);
let anchor = path.root(spent_note.commitment().into()).unwrap();
let anchor = path.root(spent_note.commitment().into());
(
Circuit {

9
src/tree.rs
View File

@ -96,7 +96,7 @@ impl MerklePath {
/// - when hashing two leaves, we produce a node on the layer above the leaves, i.e.
/// layer = 31, l = 0
/// - when hashing to the final root, we produce the anchor with layer = 0, l = 31.
pub fn root(&self, cmx: ExtractedNoteCommitment) -> CtOption<Anchor> {
pub fn root(&self, cmx: ExtractedNoteCommitment) -> Anchor {
self.auth_path
.iter()
.enumerate()
@ -107,7 +107,8 @@ impl MerklePath {
node.and_then(|n| hash_with_l(l, cond_swap(swap, n, *sibling)))
},
)
.map(Anchor)
.unwrap_or_else(pallas::Base::zero)
.into()
}
/// Returns the position of the leaf using this Merkle path.
@ -435,7 +436,7 @@ pub mod testing {
};
// Compute anchor for this tree
let anchor = auth_paths[0].root(notes[0].commitment().into()).unwrap();
let anchor = auth_paths[0].root(notes[0].commitment().into());
(
notes.into_iter().zip(auth_paths.into_iter()).map(|(note, auth_path)| (note, auth_path)).collect(),
@ -452,7 +453,7 @@ pub mod testing {
(notes_and_auth_paths, anchor) in (1usize..4).prop_flat_map(|n_notes| arb_tree(n_notes))
) {
for (note, auth_path) in notes_and_auth_paths.iter() {
let computed_anchor = auth_path.root(note.commitment().into()).unwrap();
let computed_anchor = auth_path.root(note.commitment().into());
assert_eq!(anchor, computed_anchor);
}
}