diff --git a/crates/chain/src/tx_graph.rs b/crates/chain/src/tx_graph.rs index 4bc1552b..965174fe 100644 --- a/crates/chain/src/tx_graph.rs +++ b/crates/chain/src/tx_graph.rs @@ -981,10 +981,10 @@ impl TxGraph { /// If the [`ChainOracle`] implementation (`chain`) fails, an error will be returned with the /// returned item. /// - /// If the [`ChainOracle`] is infallible, [`list_chain_txs`] can be used instead. + /// If the [`ChainOracle`] is infallible, [`list_canonical_txs`] can be used instead. /// - /// [`list_chain_txs`]: Self::list_chain_txs - pub fn try_list_chain_txs<'a, C: ChainOracle + 'a>( + /// [`list_canonical_txs`]: Self::list_canonical_txs + pub fn try_list_canonical_txs<'a, C: ChainOracle + 'a>( &'a self, chain: &'a C, chain_tip: BlockId, @@ -1003,15 +1003,15 @@ impl TxGraph { /// List graph transactions that are in `chain` with `chain_tip`. /// - /// This is the infallible version of [`try_list_chain_txs`]. + /// This is the infallible version of [`try_list_canonical_txs`]. /// - /// [`try_list_chain_txs`]: Self::try_list_chain_txs - pub fn list_chain_txs<'a, C: ChainOracle + 'a>( + /// [`try_list_canonical_txs`]: Self::try_list_canonical_txs + pub fn list_canonical_txs<'a, C: ChainOracle + 'a>( &'a self, chain: &'a C, chain_tip: BlockId, ) -> impl Iterator, A>> { - self.try_list_chain_txs(chain, chain_tip) + self.try_list_canonical_txs(chain, chain_tip) .map(|r| r.expect("oracle is infallible")) } diff --git a/crates/chain/tests/test_tx_graph_conflicts.rs b/crates/chain/tests/test_tx_graph_conflicts.rs index 0856eec9..512b076d 100644 --- a/crates/chain/tests/test_tx_graph_conflicts.rs +++ b/crates/chain/tests/test_tx_graph_conflicts.rs @@ -15,7 +15,7 @@ struct Scenario<'a> { name: &'a str, /// Transaction templates tx_templates: &'a [TxTemplate<'a, BlockId>], - /// Names of txs that must exist in the output of `list_chain_txs` + /// Names of txs that must exist in the output of `list_canonical_txs` exp_chain_txs: HashSet<&'a str>, /// Outpoints that must exist in the output of `filter_chain_txouts` exp_chain_txouts: HashSet<(&'a str, u32)>, @@ -27,7 +27,7 @@ struct Scenario<'a> { /// This test ensures that [`TxGraph`] will reliably filter out irrelevant transactions when /// presented with multiple conflicting transaction scenarios using the [`TxTemplate`] structure. -/// This test also checks that [`TxGraph::list_chain_txs`], [`TxGraph::filter_chain_txouts`], +/// This test also checks that [`TxGraph::list_canonical_txs`], [`TxGraph::filter_chain_txouts`], /// [`TxGraph::filter_chain_unspents`], and [`TxGraph::balance`] return correct data. #[test] fn test_tx_conflict_handling() { @@ -597,7 +597,7 @@ fn test_tx_conflict_handling() { let (tx_graph, spk_index, exp_tx_ids) = init_graph(scenario.tx_templates.iter()); let txs = tx_graph - .list_chain_txs(&local_chain, chain_tip) + .list_canonical_txs(&local_chain, chain_tip) .map(|tx| tx.tx_node.txid) .collect::>(); let exp_txs = scenario @@ -607,7 +607,7 @@ fn test_tx_conflict_handling() { .collect::>(); assert_eq!( txs, exp_txs, - "\n[{}] 'list_chain_txs' failed", + "\n[{}] 'list_canonical_txs' failed", scenario.name ); diff --git a/crates/wallet/src/wallet/mod.rs b/crates/wallet/src/wallet/mod.rs index 85c47aed..6f8f8d0d 100644 --- a/crates/wallet/src/wallet/mod.rs +++ b/crates/wallet/src/wallet/mod.rs @@ -1091,7 +1091,7 @@ impl Wallet { { self.indexed_graph .graph() - .list_chain_txs(&self.chain, self.chain.tip().block_id()) + .list_canonical_txs(&self.chain, self.chain.tip().block_id()) } /// Return the balance, separated into available, trusted-pending, untrusted-pending and immature diff --git a/example-crates/example_electrum/src/main.rs b/example-crates/example_electrum/src/main.rs index 4789269d..79c6f79e 100644 --- a/example-crates/example_electrum/src/main.rs +++ b/example-crates/example_electrum/src/main.rs @@ -277,7 +277,7 @@ fn main() -> anyhow::Result<()> { if unconfirmed { let unconfirmed_txids = graph .graph() - .list_chain_txs(&*chain, chain_tip.block_id()) + .list_canonical_txs(&*chain, chain_tip.block_id()) .filter(|canonical_tx| !canonical_tx.chain_position.is_confirmed()) .map(|canonical_tx| canonical_tx.tx_node.txid) .collect::>(); diff --git a/example-crates/example_esplora/src/main.rs b/example-crates/example_esplora/src/main.rs index 3f9b8721..60cf1ef3 100644 --- a/example-crates/example_esplora/src/main.rs +++ b/example-crates/example_esplora/src/main.rs @@ -307,7 +307,7 @@ fn main() -> anyhow::Result<()> { // `EsploraExt::update_tx_graph_without_keychain`. let unconfirmed_txids = graph .graph() - .list_chain_txs(&*chain, local_tip.block_id()) + .list_canonical_txs(&*chain, local_tip.block_id()) .filter(|canonical_tx| !canonical_tx.chain_position.is_confirmed()) .map(|canonical_tx| canonical_tx.tx_node.txid) .collect::>();