chore(wallet): remove duplicated InsufficientFunds error member from CreateTxError

review: move back to old error naming
This commit is contained in:
e1a0a0ea authored and 志宇 committed 2024-06-06 11:08:23 +08:00
1 parent 8eef350bd0
commit 29c8a00b43
2 files changed
+4 -16

No files matched your search

-14
View File
@@ -94,13 +94,6 @@ pub enum CreateTxError {
ChangePolicyDescriptor,
/// There was an error with coin selection
CoinSelection(coin_selection::Error),
/// Wallet's UTXO set is not enough to cover recipient's requested plus fee
InsufficientFunds {
/// Sats needed for some transaction
needed: u64,
/// Sats available for spending
available: u64,
},
/// Cannot build a tx without recipients
NoRecipients,
/// Partially signed bitcoin transaction error
@@ -184,13 +177,6 @@ impl fmt::Display for CreateTxError {
)
}
CreateTxError::CoinSelection(e) => e.fmt(f),
CreateTxError::InsufficientFunds { needed, available } => {
write!(
f,
"Insufficient funds: {} sat available of {} sat needed",
available, needed
)
}
CreateTxError::NoRecipients => {
write!(f, "Cannot build tx without recipients")
}
+4 -2
View File
@@ -73,6 +73,8 @@ use crate::types::*;
use crate::wallet::coin_selection::Excess::{Change, NoChange};
use crate::wallet::error::{BuildFeeBumpError, CreateTxError, MiniscriptPsbtError};
use self::coin_selection::Error;
const COINBASE_MATURITY: u32 = 100;
/// A Bitcoin wallet
@@ -1595,10 +1597,10 @@ impl Wallet {
change_fee,
} = excess
{
return Err(CreateTxError::InsufficientFunds {
return Err(CreateTxError::CoinSelection(Error::InsufficientFunds {
needed: *dust_threshold,
available: remaining_amount.saturating_sub(*change_fee),
});
}));
}
} else {
return Err(CreateTxError::NoRecipients);