Skip to content

Commit 965cbe6

Browse files
Shourya742evanlinjin
Shourya742
authored and
evanlinjin
committed
Rename fields of tx_graph::Additions
* Changed `tx` to `txs` * Changed `txout` to `txouts`
1 parent b275687 commit 965cbe6

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

‎crates/chain/src/indexed_tx_graph.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ impl<A: Anchor, I: Indexer> IndexedTxGraph<A, I> {
5151

5252
self.index.apply_additions(index_additions);
5353

54-
for tx in &graph_additions.tx {
54+
for tx in &graph_additions.txs {
5555
self.index.index_tx(tx);
5656
}
57-
for (&outpoint, txout) in &graph_additions.txout {
57+
for (&outpoint, txout) in &graph_additions.txouts {
5858
self.index.index_txout(outpoint, txout);
5959
}
6060

@@ -73,10 +73,10 @@ where
7373
let graph_additions = self.graph.apply_update(update);
7474

7575
let mut index_additions = I::Additions::default();
76-
for added_tx in &graph_additions.tx {
76+
for added_tx in &graph_additions.txs {
7777
index_additions.append(self.index.index_tx(added_tx));
7878
}
79-
for (&added_outpoint, added_txout) in &graph_additions.txout {
79+
for (&added_outpoint, added_txout) in &graph_additions.txouts {
8080
index_additions.append(self.index.index_txout(added_outpoint, added_txout));
8181
}
8282

‎crates/chain/src/tx_graph.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ impl<A: Clone + Ord> TxGraph<A> {
482482

483483
/// Applies [`Additions`] to [`TxGraph`].
484484
pub fn apply_additions(&mut self, additions: Additions<A>) {
485-
for tx in additions.tx {
485+
for tx in additions.txs {
486486
let txid = tx.txid();
487487

488488
tx.input
@@ -513,7 +513,7 @@ impl<A: Clone + Ord> TxGraph<A> {
513513
}
514514
}
515515

516-
for (outpoint, txout) in additions.txout {
516+
for (outpoint, txout) in additions.txouts {
517517
let tx_entry = self
518518
.txs
519519
.entry(outpoint.txid)
@@ -553,11 +553,11 @@ impl<A: Clone + Ord> TxGraph<A> {
553553
for (&txid, (update_tx_node, _, update_last_seen)) in &update.txs {
554554
let prev_last_seen: u64 = match (self.txs.get(&txid), update_tx_node) {
555555
(None, TxNodeInternal::Whole(update_tx)) => {
556-
additions.tx.insert(update_tx.clone());
556+
additions.txs.insert(update_tx.clone());
557557
0
558558
}
559559
(None, TxNodeInternal::Partial(update_txos)) => {
560-
additions.txout.extend(
560+
additions.txouts.extend(
561561
update_txos
562562
.iter()
563563
.map(|(&vout, txo)| (OutPoint::new(txid, vout), txo.clone())),
@@ -569,14 +569,14 @@ impl<A: Clone + Ord> TxGraph<A> {
569569
Some((TxNodeInternal::Partial(_), _, last_seen)),
570570
TxNodeInternal::Whole(update_tx),
571571
) => {
572-
additions.tx.insert(update_tx.clone());
572+
additions.txs.insert(update_tx.clone());
573573
*last_seen
574574
}
575575
(
576576
Some((TxNodeInternal::Partial(txos), _, last_seen)),
577577
TxNodeInternal::Partial(update_txos),
578578
) => {
579-
additions.txout.extend(
579+
additions.txouts.extend(
580580
update_txos
581581
.iter()
582582
.filter(|(vout, _)| !txos.contains_key(*vout))
@@ -983,17 +983,17 @@ impl<A: Anchor> TxGraph<A> {
983983
)]
984984
#[must_use]
985985
pub struct Additions<A = ()> {
986-
pub tx: BTreeSet<Transaction>,
987-
pub txout: BTreeMap<OutPoint, TxOut>,
986+
pub txs: BTreeSet<Transaction>,
987+
pub txouts: BTreeMap<OutPoint, TxOut>,
988988
pub anchors: BTreeSet<(A, Txid)>,
989989
pub last_seen: BTreeMap<Txid, u64>,
990990
}
991991

992992
impl<A> Default for Additions<A> {
993993
fn default() -> Self {
994994
Self {
995-
tx: Default::default(),
996-
txout: Default::default(),
995+
txs: Default::default(),
996+
txouts: Default::default(),
997997
anchors: Default::default(),
998998
last_seen: Default::default(),
999999
}
@@ -1003,27 +1003,27 @@ impl<A> Default for Additions<A> {
10031003
impl<A> Additions<A> {
10041004
/// Returns true if the [`Additions`] is empty (no transactions or txouts).
10051005
pub fn is_empty(&self) -> bool {
1006-
self.tx.is_empty() && self.txout.is_empty()
1006+
self.txs.is_empty() && self.txouts.is_empty()
10071007
}
10081008

10091009
/// Iterates over all outpoints contained within [`Additions`].
10101010
pub fn txouts(&self) -> impl Iterator<Item = (OutPoint, &TxOut)> {
1011-
self.tx
1011+
self.txs
10121012
.iter()
10131013
.flat_map(|tx| {
10141014
tx.output
10151015
.iter()
10161016
.enumerate()
10171017
.map(move |(vout, txout)| (OutPoint::new(tx.txid(), vout as _), txout))
10181018
})
1019-
.chain(self.txout.iter().map(|(op, txout)| (*op, txout)))
1019+
.chain(self.txouts.iter().map(|(op, txout)| (*op, txout)))
10201020
}
10211021
}
10221022

10231023
impl<A: Ord> Append for Additions<A> {
10241024
fn append(&mut self, mut other: Self) {
1025-
self.tx.append(&mut other.tx);
1026-
self.txout.append(&mut other.txout);
1025+
self.txs.append(&mut other.txs);
1026+
self.txouts.append(&mut other.txouts);
10271027
self.anchors.append(&mut other.anchors);
10281028

10291029
// last_seen timestamps should only increase
@@ -1037,8 +1037,8 @@ impl<A: Ord> Append for Additions<A> {
10371037
}
10381038

10391039
fn is_empty(&self) -> bool {
1040-
self.tx.is_empty()
1041-
&& self.txout.is_empty()
1040+
self.txs.is_empty()
1041+
&& self.txouts.is_empty()
10421042
&& self.anchors.is_empty()
10431043
&& self.last_seen.is_empty()
10441044
}

‎crates/chain/tests/test_indexed_tx_graph.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn insert_relevant_txs() {
6868
graph.insert_relevant_txs(txs.iter().map(|tx| (tx, None)), None),
6969
IndexedAdditions {
7070
graph_additions: Additions {
71-
tx: txs.into(),
71+
txs: txs.into(),
7272
..Default::default()
7373
},
7474
index_additions: DerivationAdditions([((), 9_u32)].into()),

‎crates/chain/tests/test_tx_graph.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn insert_txouts() {
7171
assert_eq!(
7272
graph.insert_txout(*outpoint, txout.clone()),
7373
Additions {
74-
txout: [(*outpoint, txout.clone())].into(),
74+
txouts: [(*outpoint, txout.clone())].into(),
7575
..Default::default()
7676
}
7777
);
@@ -87,16 +87,16 @@ fn insert_txouts() {
8787
assert_eq!(
8888
graph.insert_txout(*outpoint, txout.clone()),
8989
Additions {
90-
txout: [(*outpoint, txout.clone())].into(),
90+
txouts: [(*outpoint, txout.clone())].into(),
9191
..Default::default()
9292
}
9393
);
9494
// Mark them unconfirmed.
9595
assert_eq!(
9696
graph.insert_anchor(outpoint.txid, unconf_anchor),
9797
Additions {
98-
tx: [].into(),
99-
txout: [].into(),
98+
txs: [].into(),
99+
txouts: [].into(),
100100
anchors: [(unconf_anchor, outpoint.txid)].into(),
101101
last_seen: [].into()
102102
}
@@ -105,8 +105,8 @@ fn insert_txouts() {
105105
assert_eq!(
106106
graph.insert_seen_at(outpoint.txid, 1000000),
107107
Additions {
108-
tx: [].into(),
109-
txout: [].into(),
108+
txs: [].into(),
109+
txouts: [].into(),
110110
anchors: [].into(),
111111
last_seen: [(outpoint.txid, 1000000)].into()
112112
}
@@ -116,7 +116,7 @@ fn insert_txouts() {
116116
assert_eq!(
117117
graph.insert_tx(update_txs.clone()),
118118
Additions {
119-
tx: [update_txs.clone()].into(),
119+
txs: [update_txs.clone()].into(),
120120
..Default::default()
121121
}
122122
);
@@ -125,8 +125,8 @@ fn insert_txouts() {
125125
assert_eq!(
126126
graph.insert_anchor(update_txs.txid(), conf_anchor),
127127
Additions {
128-
tx: [].into(),
129-
txout: [].into(),
128+
txs: [].into(),
129+
txouts: [].into(),
130130
anchors: [(conf_anchor, update_txs.txid())].into(),
131131
last_seen: [].into()
132132
}
@@ -140,8 +140,8 @@ fn insert_txouts() {
140140
assert_eq!(
141141
additions,
142142
Additions {
143-
tx: [update_txs.clone()].into(),
144-
txout: update_ops.into(),
143+
txs: [update_txs.clone()].into(),
144+
txouts: update_ops.into(),
145145
anchors: [(conf_anchor, update_txs.txid()), (unconf_anchor, h!("tx2"))].into(),
146146
last_seen: [(h!("tx2"), 1000000)].into()
147147
}

‎crates/electrum/src/electrum_ext.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ impl<K> ElectrumUpdate<K, ConfirmationHeightAnchor> {
101101
let graph_additions = {
102102
let old_additions = TxGraph::default().determine_additions(&update.graph);
103103
tx_graph::Additions {
104-
tx: old_additions.tx,
105-
txout: old_additions.txout,
104+
txs: old_additions.txs,
105+
txouts: old_additions.txouts,
106106
last_seen: old_additions.last_seen,
107107
anchors: old_additions
108108
.anchors

0 commit comments

Comments
 (0)