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

Merge branch 'fix_premature_tracking'

This commit is contained in:
Kris Nuttycombe 2023-03-21 12:14:54 -06:00
parent 9a0e39af3a 22c2c019cc
commit 3077e94301
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bridgetree/src/lib.rs
View File

@ -980,7 +980,6 @@ impl<H: Hashable + Ord + Clone, const DEPTH: u8> BridgeTree<H, DEPTH> {
pub fn mark(&mut self) -> Option<Position> {
match self.current_bridge.take() {
Some(mut cur_b) => {
cur_b.track_current_leaf();
let pos = cur_b.position();
// If the latest bridge is a newly created checkpoint, the last prior
// bridge will have the same position and all we need to do is mark
@ -992,8 +991,10 @@ impl<H: Hashable + Ord + Clone, const DEPTH: u8> BridgeTree<H, DEPTH> {
{
// the current bridge has not been advanced, so we just need to make
// sure that we have are tracking the marked leaf
cur_b.track_current_leaf();
self.current_bridge = Some(cur_b);
} else {
// the successor(true) call will ensure that the marked leaf is tracked
let successor = cur_b.successor(true);
self.prior_bridges.push(cur_b);
self.current_bridge = Some(successor);