From ae00e1ee7b95c622fc3992c0804dd4b4517efc7b Mon Sep 17 00:00:00 2001 From: LLFourn Date: Fri, 9 Feb 2024 19:43:26 +1100 Subject: [PATCH] fix(chain): tx_graph::ChangeSet::is_empty --- crates/chain/src/tx_graph.rs | 5 ++++- crates/chain/tests/test_tx_graph.rs | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/crates/chain/src/tx_graph.rs b/crates/chain/src/tx_graph.rs index 66d1e950..cfa9d5f5 100644 --- a/crates/chain/src/tx_graph.rs +++ b/crates/chain/src/tx_graph.rs @@ -1214,7 +1214,10 @@ impl Default for ChangeSet { impl ChangeSet { /// Returns true if the [`ChangeSet`] is empty (no transactions or txouts). pub fn is_empty(&self) -> bool { - self.txs.is_empty() && self.txouts.is_empty() + self.txs.is_empty() + && self.txouts.is_empty() + && self.anchors.is_empty() + && self.last_seen.is_empty() } /// Iterates over all outpoints contained within [`ChangeSet`]. diff --git a/crates/chain/tests/test_tx_graph.rs b/crates/chain/tests/test_tx_graph.rs index a71e24f9..4afdd66e 100644 --- a/crates/chain/tests/test_tx_graph.rs +++ b/crates/chain/tests/test_tx_graph.rs @@ -213,7 +213,8 @@ fn insert_tx_graph_doesnt_count_coinbase_as_spent() { }; let mut graph = TxGraph::<()>::default(); - let _ = graph.insert_tx(tx); + let changeset = graph.insert_tx(tx); + assert!(!changeset.is_empty()); assert!(graph.outspends(OutPoint::null()).is_empty()); assert!(graph.tx_spends(Txid::all_zeros()).next().is_none()); } @@ -289,7 +290,7 @@ fn insert_tx_displaces_txouts() { }], }; - let _ = tx_graph.insert_txout( + let changeset = tx_graph.insert_txout( OutPoint { txid: tx.txid(), vout: 0, @@ -300,6 +301,8 @@ fn insert_tx_displaces_txouts() { }, ); + assert!(!changeset.is_empty()); + let _ = tx_graph.insert_txout( OutPoint { txid: tx.txid(), @@ -653,7 +656,8 @@ fn test_walk_ancestors() { ]); [&tx_a0, &tx_b1].iter().for_each(|&tx| { - let _ = graph.insert_anchor(tx.txid(), tip.block_id()); + let changeset = graph.insert_anchor(tx.txid(), tip.block_id()); + assert!(!changeset.is_empty()); }); let ancestors = [ @@ -1027,10 +1031,12 @@ fn test_changeset_last_seen_append() { last_seen: original_ls.map(|ls| (txid, ls)).into_iter().collect(), ..Default::default() }; + assert!(!original.is_empty() || original_ls.is_none()); let update = ChangeSet::<()> { last_seen: update_ls.map(|ls| (txid, ls)).into_iter().collect(), ..Default::default() }; + assert!(!update.is_empty() || update_ls.is_none()); original.append(update); assert_eq!(