frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(chain): simplify Append::append impl for keychain::ChangeSet

Browse Source 
We only need to loop though entries of `other`. The logic before was
wasteful because we were also looping though all entries of `self` even
if we do not need to modify the `self` entry.
This commit is contained in:
志宇 2024-05-04 23:37:42 +08:00 committed by Daniela Brozzoni
parent 1d294b734d
commit 6a3fb849e8
No known key found for this signature in database
GPG Key ID: 7DE4F1FDCED0AB87
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/chain/src/keychain/txout_index.rs
View File

@ -49,23 +49,26 @@ impl<K: Ord> Append for ChangeSet<K> {
/// ///
/// For each `last_revealed` in the given [`ChangeSet`]: /// For each `last_revealed` in the given [`ChangeSet`]:
/// If the keychain already exists, increase the index when the other's index > self's index. /// If the keychain already exists, increase the index when the other's index > self's index.
fn append(&mut self, mut other: Self) { fn append(&mut self, other: Self) {
for (keychain, descriptor) in &mut self.keychains_added {
if let Some(other_descriptor) = other.keychains_added.remove(keychain) {
*descriptor = other_descriptor;
}
}
for (descriptor_id, index) in &mut self.last_revealed {
if let Some(other_index) = other.last_revealed.remove(descriptor_id) {
*index = other_index.max(*index);
}
}
// We use `extend` instead of `BTreeMap::append` due to performance issues with `append`. // We use `extend` instead of `BTreeMap::append` due to performance issues with `append`.
// Refer to https://github.com/rust-lang/rust/issues/34666#issuecomment-675658420 // Refer to https://github.com/rust-lang/rust/issues/34666#issuecomment-675658420
self.keychains_added.extend(other.keychains_added); self.keychains_added.extend(other.keychains_added);
self.last_revealed.extend(other.last_revealed);
// for `last_revealed`, entries of `other` will take precedence ONLY if it is greater than
// what was originally in `self`.
for (desc_id, index) in other.last_revealed {
use crate::collections::btree_map::Entry;
match self.last_revealed.entry(desc_id) {
Entry::Vacant(entry) => {
entry.insert(index);
}
Entry::Occupied(mut entry) => {
if *entry.get() < index {
entry.insert(index);
}
}
}
}
} }
/// Returns whether the changeset are empty. /// Returns whether the changeset are empty.