refactor: Rename InputStatus to TxStatus

Author: evanlinjin

examples/common.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use bdk_bitcoind_rpc::Emitter;
 use bdk_chain::{bdk_core, Anchor, Balance, ChainPosition, ConfirmationBlockTime};
 use bdk_testenv::{bitcoincore_rpc::RpcApi, TestEnv};
-use bdk_tx::{CanonicalUnspents, Input, InputCandidates, InputStatus, RbfParams, TxWithStatus};
+use bdk_tx::{CanonicalUnspents, Input, InputCandidates, RbfParams, TxStatus, TxWithStatus};
 use bitcoin::{absolute, Address, BlockHash, OutPoint, Transaction, Txid};
 use miniscript::{
     plan::{Assets, Plan},
@@ -106,11 +106,9 @@ impl Wallet {
     }
 
     pub fn canonical_txs(&self) -> impl Iterator<Item = TxWithStatus<Arc<Transaction>>> + '_ {
-        pub fn status_from_position(
-            pos: ChainPosition<ConfirmationBlockTime>,
-        ) -> Option<InputStatus> {
+        pub fn status_from_position(pos: ChainPosition<ConfirmationBlockTime>) -> Option<TxStatus> {
             match pos {
-                bdk_chain::ChainPosition::Confirmed { anchor, .. } => Some(InputStatus {
+                bdk_chain::ChainPosition::Confirmed { anchor, .. } => Some(TxStatus {
                     height: absolute::Height::from_consensus(
                         anchor.confirmation_height_upper_bound(),
                     )
@@ -151,8 +149,6 @@ impl Wallet {
 
         // Exclude txs that reside-in `rbf_set`.
         let rbf_set = canon_utxos.extract_replacements(replace)?;
-        // TODO: We should really be returning an error if we fail to select an input of a tx we
-        // are intending to replace.
         let must_select = rbf_set
             .must_select_largest_input_of_each_original_tx(&canon_utxos)?
             .into_iter()

src/canonical_unspents.rs

@@ -6,17 +6,17 @@ use bitcoin::{psbt, OutPoint, Sequence, Transaction, TxOut, Txid};
 use miniscript::{bitcoin, plan::Plan};
 
 use crate::{
-    collections::HashMap, input::CoinbaseMismatch, FromPsbtInputError, Input, InputStatus, RbfSet,
+    collections::HashMap, input::CoinbaseMismatch, FromPsbtInputError, Input, RbfSet, TxStatus,
 };
 
 /// Tx with confirmation status.
-pub type TxWithStatus<T> = (T, Option<InputStatus>);
+pub type TxWithStatus<T> = (T, Option<TxStatus>);
 
 /// Our canonical view of unspent outputs.
 #[derive(Debug, Clone)]
 pub struct CanonicalUnspents {
     txs: HashMap<Txid, Arc<Transaction>>,
-    statuses: HashMap<Txid, InputStatus>,
+    statuses: HashMap<Txid, TxStatus>,
     spends: HashMap<OutPoint, Txid>,
 }
 

src/input.rs

@@ -9,9 +9,9 @@ use miniscript::bitcoin;
 use miniscript::bitcoin::{OutPoint, Transaction, TxOut};
 use miniscript::plan::Plan;
 
-/// Confirmation status of a tx input.
+/// Confirmation status of a tx data.
 #[derive(Debug, Clone, Copy)]
-pub struct InputStatus {
+pub struct TxStatus {
     /// Confirmation block height.
     pub height: absolute::Height,
     /// Confirmation block median time past.
@@ -21,7 +21,7 @@ pub struct InputStatus {
     pub time: absolute::Time,
 }
 
-impl InputStatus {
+impl TxStatus {
     /// From consensus `height` and `time`.
     pub fn new(height: u32, time: u64) -> Result<Self, absolute::ConversionError> {
         Ok(Self {
@@ -190,7 +190,7 @@ pub struct Input {
     prev_txout: TxOut,
     prev_tx: Option<Arc<Transaction>>,
     plan: PlanOrPsbtInput,
-    status: Option<InputStatus>,
+    status: Option<TxStatus>,
     is_coinbase: bool,
 }
 
@@ -205,7 +205,7 @@ impl Input {
         plan: Plan,
         prev_tx: T,
         output_index: usize,
-        status: Option<InputStatus>,
+        status: Option<TxStatus>,
     ) -> Result<Self, OutputsIndexError>
     where
         T: Into<Arc<Transaction>>,
@@ -227,7 +227,7 @@ impl Input {
         plan: Plan,
         prev_outpoint: OutPoint,
         prev_txout: TxOut,
-        status: Option<InputStatus>,
+        status: Option<TxStatus>,
         is_coinbase: bool,
     ) -> Self {
         Self {
@@ -253,7 +253,7 @@ impl Input {
         sequence: Sequence,
         psbt_input: psbt::Input,
         satisfaction_weight: usize,
-        status: Option<InputStatus>,
+        status: Option<TxStatus>,
         is_coinbase: bool,
     ) -> Result<Self, FromPsbtInputError> {
         let outpoint = prev_outpoint;
@@ -331,7 +331,7 @@ impl Input {
     }
 
     /// Confirmation status.
-    pub fn status(&self) -> Option<InputStatus> {
+    pub fn status(&self) -> Option<TxStatus> {
         self.status
     }