Skip to content

fix(smt): bind insert result before debug_assert to keep side effect #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TaprootFreak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(smt): bind insert result before debug_assert to keep side effect #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions program/src/merkle/sparse_merkle_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,11 @@ impl SparseMerkleTree {
};
}

// Store the leaf to get it with the key
debug_assert_eq!(self.leaf_values.insert(key, leaf), None);
// Store the leaf to get it with the key.
// Bind the insert result first: `debug_assert!` is a no-op in release
// and would otherwise drop the side effect entirely.
let prev_leaf = self.leaf_values.insert(key, leaf);
debug_assert_eq!(prev_leaf, None);

// Hash leaf with key
let leaf_hash = hash_concat(&leaf, &key);
Expand All @@ -295,8 +298,9 @@ impl SparseMerkleTree {
};
}
}
// Update the merkle root
debug_assert_ne!(self.nodes.insert((0, [0; 32]), current_hash), Some(current_hash));
// Update the merkle root. Same caveat as above: bind first, assert second.
let prev_root = self.nodes.insert((0, [0; 32]), current_hash);
debug_assert_ne!(prev_root, Some(current_hash));

Ok(())
}
Expand Down