refactor: remove TxNode's _unconfirmed suffix for consistency

Author: uvuvuwu

crates/chain/src/tx_graph.rs

@@ -217,9 +217,9 @@ pub struct TxNode<'a, T, A> {
     /// The blocks that the transaction is "anchored" in.
     pub anchors: &'a BTreeSet<A>,
     /// The first-seen unix timestamp of the transaction as unconfirmed.
-    pub first_seen_unconfirmed: Option<u64>,
+    pub first_seen: Option<u64>,
     /// The last-seen unix timestamp of the transaction as unconfirmed.
-    pub last_seen_unconfirmed: Option<u64>,
+    pub last_seen: Option<u64>,
 }
 
 impl<T, A> Deref for TxNode<'_, T, A> {
@@ -341,8 +341,8 @@ impl<A> TxGraph<A> {
                 txid,
                 tx: tx.clone(),
                 anchors: self.anchors.get(&txid).unwrap_or(&self.empty_anchors),
-                first_seen_unconfirmed: self.first_seen.get(&txid).copied(),
-                last_seen_unconfirmed: self.last_seen.get(&txid).copied(),
+                first_seen: self.first_seen.get(&txid).copied(),
+                last_seen: self.last_seen.get(&txid).copied(),
             }),
             TxNodeInternal::Partial(_) => None,
         })
@@ -353,7 +353,7 @@ impl<A> TxGraph<A> {
         &self,
     ) -> impl Iterator<Item = TxNode<'_, Arc<Transaction>, A>> {
         self.full_txs().filter_map(|tx| {
-            if tx.anchors.is_empty() && tx.last_seen_unconfirmed.is_none() {
+            if tx.anchors.is_empty() && tx.last_seen.is_none() {
                 Some(tx)
             } else {
                 None
@@ -377,8 +377,8 @@ impl<A> TxGraph<A> {
                 txid,
                 tx: tx.clone(),
                 anchors: self.anchors.get(&txid).unwrap_or(&self.empty_anchors),
-                first_seen_unconfirmed: self.first_seen.get(&txid).copied(),
-                last_seen_unconfirmed: self.last_seen.get(&txid).copied(),
+                first_seen: self.first_seen.get(&txid).copied(),
+                last_seen: self.last_seen.get(&txid).copied(),
             }),
             _ => None,
         }
@@ -1023,13 +1023,13 @@ impl<A: Anchor> TxGraph<A> {
                                     transitively: None,
                                 },
                                 None => ChainPosition::Unconfirmed {
-                                    first_seen: tx_node.first_seen_unconfirmed,
-                                    last_seen: tx_node.last_seen_unconfirmed,
+                                    first_seen: tx_node.first_seen,
+                                    last_seen: tx_node.last_seen,
                                 },
                             },
                             None => ChainPosition::Unconfirmed {
-                                first_seen: tx_node.first_seen_unconfirmed,
-                                last_seen: tx_node.last_seen_unconfirmed,
+                                first_seen: tx_node.first_seen,
+                                last_seen: tx_node.last_seen,
                             },
                         },
                         CanonicalReason::Anchor { anchor, descendant } => match descendant {
@@ -1050,11 +1050,11 @@ impl<A: Anchor> TxGraph<A> {
                         },
                         CanonicalReason::ObservedIn { observed_in, .. } => match observed_in {
                             ObservedIn::Mempool(last_seen) => ChainPosition::Unconfirmed {
-                                first_seen: tx_node.first_seen_unconfirmed,
+                                first_seen: tx_node.first_seen,
                                 last_seen: Some(last_seen),
                             },
                             ObservedIn::Block(_) => ChainPosition::Unconfirmed {
-                                first_seen: tx_node.first_seen_unconfirmed,
+                                first_seen: tx_node.first_seen,
                                 last_seen: None,
                             },
                         },

crates/chain/tests/test_tx_graph.rs

@@ -1326,10 +1326,7 @@ fn call_map_anchors_with_non_deterministic_anchor() {
         let new_txnode = new_txs.next().unwrap();
         assert_eq!(new_txnode.txid, tx_node.txid);
         assert_eq!(new_txnode.tx, tx_node.tx);
-        assert_eq!(
-            new_txnode.last_seen_unconfirmed,
-            tx_node.last_seen_unconfirmed
-        );
+        assert_eq!(new_txnode.last_seen, tx_node.last_seen);
         assert_eq!(new_txnode.anchors.len(), tx_node.anchors.len());
 
         let mut new_anchors: Vec<_> = new_txnode.anchors.iter().map(|a| a.anchor_block).collect();
@@ -1543,6 +1540,6 @@ fn test_get_first_seen_of_a_tx() {
     let changeset_seen = graph.insert_seen_at(txid, seen_at);
     graph.apply_changeset(changeset_seen);
 
-    let first_seen = graph.get_tx_node(txid).unwrap().first_seen_unconfirmed;
+    let first_seen = graph.get_tx_node(txid).unwrap().first_seen;
     assert_eq!(first_seen, Some(seen_at));
 }