Skip to content

Commit c70b40b

Browse files
evanlinjinevanlinjin
committed
refactor(chain)!: rm CanonicalizationParams::NONE
The `default()` impl is sufficient.
1 parent 66071de commit c70b40b

File tree

12 files changed

+34
-41
lines changed

12 files changed

+34
-41
lines changed

‎crates/bitcoind_rpc/tests/test_emitter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ fn get_balance(
309309
let balance = recv_graph.graph().balance(
310310
recv_chain,
311311
chain_tip,
312-
CanonicalizationParams::NONE,
312+
CanonicalizationParams::default(),
313313
outpoints,
314314
|_, _| true,
315315
);

‎crates/chain/benches/canonicalization.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn run_list_canonical_txs(tx_graph: &KeychainTxGraph, chain: &LocalChain, exp_tx
9494
let txs = tx_graph.graph().list_canonical_txs(
9595
chain,
9696
chain.tip().block_id(),
97-
CanonicalizationParams::NONE,
97+
CanonicalizationParams::default(),
9898
);
9999
assert_eq!(txs.count(), exp_txs);
100100
}
@@ -103,7 +103,7 @@ fn run_filter_chain_txouts(tx_graph: &KeychainTxGraph, chain: &LocalChain, exp_t
103103
let utxos = tx_graph.graph().filter_chain_txouts(
104104
chain,
105105
chain.tip().block_id(),
106-
CanonicalizationParams::NONE,
106+
CanonicalizationParams::default(),
107107
tx_graph.index.outpoints().clone(),
108108
);
109109
assert_eq!(utxos.count(), exp_txos);
@@ -113,7 +113,7 @@ fn run_filter_chain_unspents(tx_graph: &KeychainTxGraph, chain: &LocalChain, exp
113113
let utxos = tx_graph.graph().filter_chain_unspents(
114114
chain,
115115
chain.tip().block_id(),
116-
CanonicalizationParams::NONE,
116+
CanonicalizationParams::default(),
117117
tx_graph.index.outpoints().clone(),
118118
);
119119
assert_eq!(utxos.count(), exp_utxos);

‎crates/chain/src/canonical_iter.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ pub struct CanonicalizationParams {
1818
pub assume_canonical: Vec<Txid>,
1919
}
2020

21-
impl CanonicalizationParams {
22-
/// No mods.
23-
pub const NONE: Self = Self {
24-
assume_canonical: Vec::new(),
25-
};
26-
}
27-
2821
/// Iterates over canonical txs.
2922
pub struct CanonicalIter<'g, A, C> {
3023
tx_graph: &'g TxGraph<A>,

‎crates/chain/tests/test_indexed_tx_graph.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ fn test_list_owned_txouts() {
271271
.filter_chain_txouts(
272272
&local_chain,
273273
chain_tip,
274-
CanonicalizationParams::NONE,
274+
CanonicalizationParams::default(),
275275
graph.index.outpoints().iter().cloned(),
276276
)
277277
.collect::<Vec<_>>();
@@ -281,15 +281,15 @@ fn test_list_owned_txouts() {
281281
.filter_chain_unspents(
282282
&local_chain,
283283
chain_tip,
284-
CanonicalizationParams::NONE,
284+
CanonicalizationParams::default(),
285285
graph.index.outpoints().iter().cloned(),
286286
)
287287
.collect::<Vec<_>>();
288288

289289
let balance = graph.graph().balance(
290290
&local_chain,
291291
chain_tip,
292-
CanonicalizationParams::NONE,
292+
CanonicalizationParams::default(),
293293
graph.index.outpoints().iter().cloned(),
294294
|_, spk: ScriptBuf| trusted_spks.contains(&spk),
295295
);
@@ -592,7 +592,7 @@ fn test_get_chain_position() {
592592
// check chain position
593593
let chain_pos = graph
594594
.graph()
595-
.list_canonical_txs(chain, chain.tip().block_id(), CanonicalizationParams::NONE)
595+
.list_canonical_txs(chain, chain.tip().block_id(), CanonicalizationParams::default())
596596
.find_map(|canon_tx| {
597597
if canon_tx.tx_node.txid == txid {
598598
Some(canon_tx.chain_position)

‎crates/chain/tests/test_tx_graph.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ fn test_chain_spends() {
953953
.filter_chain_txouts(
954954
chain,
955955
tip.block_id(),
956-
CanonicalizationParams::NONE,
956+
CanonicalizationParams::default(),
957957
tx_graph.all_txouts().map(|(op, _)| ((), op)),
958958
)
959959
.filter_map(|(_, full_txo)| Some((full_txo.outpoint, full_txo.spent_by?)))
@@ -963,7 +963,7 @@ fn test_chain_spends() {
963963
tx_graph: &TxGraph<ConfirmationBlockTime>|
964964
-> HashMap<Txid, ChainPosition<ConfirmationBlockTime>> {
965965
tx_graph
966-
.list_canonical_txs(chain, tip.block_id(), CanonicalizationParams::NONE)
966+
.list_canonical_txs(chain, tip.block_id(), CanonicalizationParams::default())
967967
.map(|canon_tx| (canon_tx.tx_node.txid, canon_tx.chain_position))
968968
.collect()
969969
};
@@ -1132,14 +1132,14 @@ fn transactions_inserted_into_tx_graph_are_not_canonical_until_they_have_an_anch
11321132
.collect();
11331133
let chain = LocalChain::from_blocks(blocks).unwrap();
11341134
let canonical_txs: Vec<_> = graph
1135-
.list_canonical_txs(&chain, chain.tip().block_id(), CanonicalizationParams::NONE)
1135+
.list_canonical_txs(&chain, chain.tip().block_id(), CanonicalizationParams::default())
11361136
.collect();
11371137
assert!(canonical_txs.is_empty());
11381138

11391139
// tx0 with seen_at should be returned by canonical txs
11401140
let _ = graph.insert_seen_at(txids[0], 2);
11411141
let mut canonical_txs =
1142-
graph.list_canonical_txs(&chain, chain.tip().block_id(), CanonicalizationParams::NONE);
1142+
graph.list_canonical_txs(&chain, chain.tip().block_id(), CanonicalizationParams::default());
11431143
assert_eq!(
11441144
canonical_txs.next().map(|tx| tx.tx_node.txid).unwrap(),
11451145
txids[0]
@@ -1149,7 +1149,7 @@ fn transactions_inserted_into_tx_graph_are_not_canonical_until_they_have_an_anch
11491149
// tx1 with anchor is also canonical
11501150
let _ = graph.insert_anchor(txids[1], block_id!(2, "B"));
11511151
let canonical_txids: Vec<_> = graph
1152-
.list_canonical_txs(&chain, chain.tip().block_id(), CanonicalizationParams::NONE)
1152+
.list_canonical_txs(&chain, chain.tip().block_id(), CanonicalizationParams::default())
11531153
.map(|tx| tx.tx_node.txid)
11541154
.collect();
11551155
assert!(canonical_txids.contains(&txids[1]));

‎crates/electrum/tests/test_electrum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn get_balance(
2323
let balance = recv_graph.graph().balance(
2424
recv_chain,
2525
chain_tip,
26-
CanonicalizationParams::NONE,
26+
CanonicalizationParams::default(),
2727
outpoints,
2828
|_, _| true,
2929
);

‎crates/wallet/src/wallet/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ impl Wallet {
817817
.filter_chain_unspents(
818818
&self.chain,
819819
self.chain.tip().block_id(),
820-
CanonicalizationParams::NONE,
820+
CanonicalizationParams::default(),
821821
self.indexed_graph.index.outpoints().iter().cloned(),
822822
)
823823
.map(|((k, i), full_txo)| new_local_utxo(k, i, full_txo))
@@ -832,7 +832,7 @@ impl Wallet {
832832
.filter_chain_txouts(
833833
&self.chain,
834834
self.chain.tip().block_id(),
835-
CanonicalizationParams::NONE,
835+
CanonicalizationParams::default(),
836836
self.indexed_graph.index.outpoints().iter().cloned(),
837837
)
838838
.map(|((k, i), full_txo)| new_local_utxo(k, i, full_txo))
@@ -886,7 +886,7 @@ impl Wallet {
886886
.filter_chain_unspents(
887887
&self.chain,
888888
self.chain.tip().block_id(),
889-
CanonicalizationParams::NONE,
889+
CanonicalizationParams::default(),
890890
core::iter::once(((), op)),
891891
)
892892
.map(|(_, full_txo)| new_local_utxo(keychain, index, full_txo))
@@ -1065,7 +1065,7 @@ impl Wallet {
10651065
.list_canonical_txs(
10661066
&self.chain,
10671067
self.chain.tip().block_id(),
1068-
CanonicalizationParams::NONE,
1068+
CanonicalizationParams::default(),
10691069
)
10701070
.find(|tx| tx.tx_node.txid == txid)
10711071
}
@@ -1088,7 +1088,7 @@ impl Wallet {
10881088
.list_canonical_txs(
10891089
&self.chain,
10901090
self.chain.tip().block_id(),
1091-
CanonicalizationParams::NONE,
1091+
CanonicalizationParams::default(),
10921092
)
10931093
.filter(|c_tx| tx_index.is_tx_relevant(&c_tx.tx_node.tx))
10941094
}
@@ -1124,7 +1124,7 @@ impl Wallet {
11241124
self.indexed_graph.graph().balance(
11251125
&self.chain,
11261126
self.chain.tip().block_id(),
1127-
CanonicalizationParams::NONE,
1127+
CanonicalizationParams::default(),
11281128
self.indexed_graph.index.outpoints().iter().cloned(),
11291129
|&(k, _), _| k == KeychainKind::Internal,
11301130
)
@@ -1595,7 +1595,7 @@ impl Wallet {
15951595
let txout_index = &self.indexed_graph.index;
15961596
let chain_tip = self.chain.tip().block_id();
15971597
let chain_positions = graph
1598-
.list_canonical_txs(&self.chain, chain_tip, CanonicalizationParams::NONE)
1598+
.list_canonical_txs(&self.chain, chain_tip, CanonicalizationParams::default())
15991599
.map(|canon_tx| (canon_tx.tx_node.txid, canon_tx.chain_position))
16001600
.collect::<HashMap<Txid, _>>();
16011601

@@ -1852,7 +1852,7 @@ impl Wallet {
18521852
let confirmation_heights = self
18531853
.indexed_graph
18541854
.graph()
1855-
.list_canonical_txs(&self.chain, chain_tip, CanonicalizationParams::NONE)
1855+
.list_canonical_txs(&self.chain, chain_tip, CanonicalizationParams::default())
18561856
.filter(|canon_tx| prev_txids.contains(&canon_tx.tx_node.txid))
18571857
// This is for a small performance gain. Although `.filter` filters out excess txs, it
18581858
// will still consume the internal `CanonicalIter` entirely. Having a `.take` here

‎crates/wallet/tests/wallet.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4267,7 +4267,7 @@ fn test_wallet_transactions_relevant() {
42674267
.list_canonical_txs(
42684268
test_wallet.local_chain(),
42694269
chain_tip,
4270-
CanonicalizationParams::NONE,
4270+
CanonicalizationParams::default(),
42714271
)
42724272
.count();
42734273

@@ -4288,7 +4288,7 @@ fn test_wallet_transactions_relevant() {
42884288
.list_canonical_txs(
42894289
test_wallet.local_chain(),
42904290
chain_tip,
4291-
CanonicalizationParams::NONE,
4291+
CanonicalizationParams::default(),
42924292
)
42934293
.count();
42944294

@@ -4301,7 +4301,7 @@ fn test_wallet_transactions_relevant() {
43014301
.list_canonical_txs(
43024302
test_wallet.local_chain(),
43034303
chain_tip,
4304-
CanonicalizationParams::NONE
4304+
CanonicalizationParams::default()
43054305
)
43064306
.any(|wallet_tx| wallet_tx.tx_node.txid == other_txid));
43074307
assert!(full_tx_count_before < full_tx_count_after);

‎example-crates/example_bitcoind_rpc_polling/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ fn main() -> anyhow::Result<()> {
186186
graph.graph().balance(
187187
&*chain,
188188
synced_to.block_id(),
189-
CanonicalizationParams::NONE,
189+
CanonicalizationParams::default(),
190190
graph.index.outpoints().iter().cloned(),
191191
|(k, _), _| k == &Keychain::Internal,
192192
)
@@ -324,7 +324,7 @@ fn main() -> anyhow::Result<()> {
324324
graph.graph().balance(
325325
&*chain,
326326
synced_to.block_id(),
327-
CanonicalizationParams::NONE,
327+
CanonicalizationParams::default(),
328328
graph.index.outpoints().iter().cloned(),
329329
|(k, _), _| k == &Keychain::Internal,
330330
)

‎example-crates/example_cli/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ pub fn planned_utxos<O: ChainOracle>(
425425
.try_filter_chain_unspents(
426426
chain,
427427
chain_tip,
428-
CanonicalizationParams::NONE,
428+
CanonicalizationParams::default(),
429429
outpoints.iter().cloned(),
430430
)?
431431
.filter_map(|((k, i), full_txo)| -> Option<Result<PlanUtxo, _>> {
@@ -521,7 +521,7 @@ pub fn handle_commands<CS: clap::Subcommand, S: clap::Args>(
521521
let balance = graph.graph().try_balance(
522522
chain,
523523
chain.get_chain_tip()?,
524-
CanonicalizationParams::NONE,
524+
CanonicalizationParams::default(),
525525
graph.index.outpoints().iter().cloned(),
526526
|(k, _), _| k == &Keychain::Internal,
527527
)?;
@@ -566,7 +566,7 @@ pub fn handle_commands<CS: clap::Subcommand, S: clap::Args>(
566566
.try_filter_chain_txouts(
567567
chain,
568568
chain_tip,
569-
CanonicalizationParams::NONE,
569+
CanonicalizationParams::default(),
570570
outpoints.iter().cloned(),
571571
)?
572572
.filter(|(_, full_txo)| match (spent, unspent) {

‎example-crates/example_electrum/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ fn main() -> anyhow::Result<()> {
229229
.filter_chain_unspents(
230230
&*chain,
231231
chain_tip.block_id(),
232-
CanonicalizationParams::NONE,
232+
CanonicalizationParams::default(),
233233
init_outpoints.iter().cloned(),
234234
)
235235
.map(|(_, utxo)| utxo.outpoint),
@@ -242,7 +242,7 @@ fn main() -> anyhow::Result<()> {
242242
.list_canonical_txs(
243243
&*chain,
244244
chain_tip.block_id(),
245-
CanonicalizationParams::NONE,
245+
CanonicalizationParams::default(),
246246
)
247247
.filter(|canonical_tx| !canonical_tx.chain_position.is_confirmed())
248248
.map(|canonical_tx| canonical_tx.tx_node.txid),

‎example-crates/example_esplora/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ fn main() -> anyhow::Result<()> {
243243
.filter_chain_unspents(
244244
&*chain,
245245
local_tip.block_id(),
246-
CanonicalizationParams::NONE,
246+
CanonicalizationParams::default(),
247247
init_outpoints.iter().cloned(),
248248
)
249249
.map(|(_, utxo)| utxo.outpoint),
@@ -259,7 +259,7 @@ fn main() -> anyhow::Result<()> {
259259
.list_canonical_txs(
260260
&*chain,
261261
local_tip.block_id(),
262-
CanonicalizationParams::NONE,
262+
CanonicalizationParams::default(),
263263
)
264264
.filter(|canonical_tx| !canonical_tx.chain_position.is_confirmed())
265265
.map(|canonical_tx| canonical_tx.tx_node.txid),

0 commit comments

Comments
 (0)