From a201be0b9fdb1811f83f95b305cffb9cd4d584d7 Mon Sep 17 00:00:00 2001 From: Leonardo Lima Date: Fri, 12 Sep 2025 14:37:31 +1000 Subject: [PATCH] chore(test): rename `txid_to_name` to proper `tx_name_to_txid` --- crates/chain/tests/common/tx_template.rs | 10 +++++----- crates/chain/tests/test_tx_graph_conflicts.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/chain/tests/common/tx_template.rs b/crates/chain/tests/common/tx_template.rs index 29f36169..52f8e850 100644 --- a/crates/chain/tests/common/tx_template.rs +++ b/crates/chain/tests/common/tx_template.rs @@ -56,7 +56,7 @@ impl TxOutTemplate { pub struct TxTemplateEnv<'a, A> { pub tx_graph: TxGraph, pub indexer: SpkTxOutIndex, - pub txid_to_name: HashMap<&'a str, Txid>, + pub tx_name_to_txid: HashMap<&'a str, Txid>, pub canonicalization_params: CanonicalizationParams, } @@ -77,7 +77,7 @@ pub fn init_graph<'a, A: Anchor + Clone + 'a>( .script_pubkey(), ); }); - let mut txid_to_name = HashMap::<&'a str, Txid>::new(); + let mut tx_name_to_txid = HashMap::<&'a str, Txid>::new(); let mut canonicalization_params = CanonicalizationParams::default(); for (bogus_txin_vout, tx_tmp) in tx_templates.into_iter().enumerate() { @@ -108,7 +108,7 @@ pub fn init_graph<'a, A: Anchor + Clone + 'a>( witness: Witness::new(), }, TxInTemplate::PrevTx(prev_name, prev_vout) => { - let prev_txid = txid_to_name.get(prev_name).expect( + let prev_txid = tx_name_to_txid.get(prev_name).expect( "txin template must spend from tx of template that comes before", ); TxIn { @@ -140,7 +140,7 @@ pub fn init_graph<'a, A: Anchor + Clone + 'a>( if tx_tmp.assume_canonical { canonicalization_params.assume_canonical.push(txid); } - txid_to_name.insert(tx_tmp.tx_name, txid); + tx_name_to_txid.insert(tx_tmp.tx_name, txid); indexer.scan(&tx); let _ = tx_graph.insert_tx(tx.clone()); for anchor in tx_tmp.anchors.iter() { @@ -153,7 +153,7 @@ pub fn init_graph<'a, A: Anchor + Clone + 'a>( TxTemplateEnv { tx_graph, indexer, - txid_to_name, + tx_name_to_txid, canonicalization_params, } } diff --git a/crates/chain/tests/test_tx_graph_conflicts.rs b/crates/chain/tests/test_tx_graph_conflicts.rs index 71944e40..113a985b 100644 --- a/crates/chain/tests/test_tx_graph_conflicts.rs +++ b/crates/chain/tests/test_tx_graph_conflicts.rs @@ -978,7 +978,7 @@ fn test_tx_conflict_handling() { let exp_txs = scenario .exp_chain_txs .iter() - .map(|txid| *env.txid_to_name.get(txid).expect("txid must exist")) + .map(|txid| *env.tx_name_to_txid.get(txid).expect("txid must exist")) .collect::>(); assert_eq!( txs, exp_txs, @@ -1000,7 +1000,7 @@ fn test_tx_conflict_handling() { .exp_chain_txouts .iter() .map(|(txid, vout)| OutPoint { - txid: *env.txid_to_name.get(txid).expect("txid must exist"), + txid: *env.tx_name_to_txid.get(txid).expect("txid must exist"), vout: *vout, }) .collect::>(); @@ -1024,7 +1024,7 @@ fn test_tx_conflict_handling() { .exp_unspents .iter() .map(|(txid, vout)| OutPoint { - txid: *env.txid_to_name.get(txid).expect("txid must exist"), + txid: *env.tx_name_to_txid.get(txid).expect("txid must exist"), vout: *vout, }) .collect::>(); -- 2.49.0