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

feat(chain)!: add take convenience method to Append trait

Browse Source 
This is useful if the caller wishes to use the type as a staging area.

This is breaking as `Append` has a `Default` bound now.
This commit is contained in:
志宇 2024-06-14 23:21:19 +08:00
parent 1eca568be5
commit feb27df180
No known key found for this signature in database
GPG Key ID: F6345C9837C2BDE8
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/chain/src/tx_data_traits.rs
View File

@ -114,12 +114,21 @@ pub trait AnchorFromBlockPosition: Anchor {
}
/// Trait that makes an object appendable.
pub trait Append {
pub trait Append: Default {
/// Append another object of the same type onto `self`.
fn append(&mut self, other: Self);
/// Returns whether the structure is considered empty.
fn is_empty(&self) -> bool;
/// Take the value, replacing it with the default value.
fn take(&mut self) -> Option<Self> {
if self.is_empty() {
None
} else {
Some(core::mem::take(self))
}
}
}
impl<K: Ord, V> Append for BTreeMap<K, V> {

6
crates/wallet/src/wallet/mod.rs
View File

@ -2291,11 +2291,7 @@ impl Wallet {
/// Take the staged [`ChangeSet`] to be persisted now (if any).
pub fn take_staged(&mut self) -> Option<ChangeSet> {
if self.stage.is_empty() {
None
} else {
Some(core::mem::take(&mut self.stage))
}
self.stage.take()
}
/// Get a reference to the inner [`TxGraph`].

12
example-crates/example_bitcoind_rpc_polling/src/main.rs
View File

@ -196,8 +196,8 @@ fn main() -> anyhow::Result<()> {
if last_db_commit.elapsed() >= DB_COMMIT_DELAY {
let db = &mut *db.lock().unwrap();
last_db_commit = Instant::now();
if !db_stage.is_empty() {
db.append_changeset(&core::mem::take(&mut db_stage))?;
if let Some(changeset) = db_stage.take() {
db.append_changeset(&changeset)?;
}
println!(
"[{:>10}s] committed to db (took {}s)",
@ -235,8 +235,8 @@ fn main() -> anyhow::Result<()> {
{
let db = &mut *db.lock().unwrap();
db_stage.append((local_chain::ChangeSet::default(), graph_changeset));
if !db_stage.is_empty() {
db.append_changeset(&core::mem::take(&mut db_stage))?;
if let Some(changeset) = db_stage.take() {
db.append_changeset(&changeset)?;
}
}
}
@ -325,8 +325,8 @@ fn main() -> anyhow::Result<()> {
if last_db_commit.elapsed() >= DB_COMMIT_DELAY {
let db = &mut *db.lock().unwrap();
last_db_commit = Instant::now();
if !db_stage.is_empty() {
db.append_changeset(&core::mem::take(&mut db_stage))?;
if let Some(changeset) = db_stage.take() {
db.append_changeset(&changeset)?;
}
println!(
"[{:>10}s] committed to db (took {}s)",