Skip to content
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

Jump to bottom

fix(trie): short circuit leaf removal if missing #12988

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(trie): short circuit leaf removal if missing #12988

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78f56aa
fix(trie): short circuit leaf removal if missing
rkrasiuk Nov 28, 2024
17a324a
insert to prefix set only after checking for value
rkrasiuk Nov 28, 2024
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
6 changes: 5 additions & 1 deletion crates/trie/sparse/src/trie.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,12 @@ impl RevealedSparseTrie {

/// Remove leaf node from the trie.
pub fn remove_leaf(&mut self, path: &Nibbles) -> SparseTrieResult<()> {
if self.values.remove(path).is_none() {
// Leaf is not present in the trie.
return Ok(())
}

self.prefix_set.insert(path.clone());
self.values.remove(path);

// If the path wasn't present in `values`, we still need to walk the trie and ensure that
// there is no node at the path. When a leaf node is a blinded `Hash`, it will have an entry
Expand Down
Loading