test: add legacy descriptor tests

wallet/src/test_utils.rs

@@ -17,8 +17,8 @@ use crate::{KeychainKind, Update, Wallet};
 /// The funded wallet contains a tx with a 76_000 sats input and two outputs, one spending 25_000
 /// to a foreign address and one returning 50_000 back to the wallet. The remaining 1000
 /// sats are the transaction fee.
-pub fn get_funded_wallet(descriptor: &str, change_descriptor: &str) -> (Wallet, Txid) {
-    new_funded_wallet(descriptor, Some(change_descriptor))
+pub fn get_funded_wallet(descriptor: &str, change_descriptor: Option<&str>) -> (Wallet, Txid) {
+    new_funded_wallet(descriptor, change_descriptor)
 }
 
 fn new_funded_wallet(descriptor: &str, change_descriptor: Option<&str>) -> (Wallet, Txid) {
@@ -131,7 +131,12 @@ pub fn get_funded_wallet_single(descriptor: &str) -> (Wallet, Txid) {
 /// Get funded segwit wallet
 pub fn get_funded_wallet_wpkh() -> (Wallet, Txid) {
     let (desc, change_desc) = get_test_wpkh_and_change_desc();
-    get_funded_wallet(desc, change_desc)
+    get_funded_wallet(desc, Some(change_desc))
+}
+
+/// `pkh` single key descriptor
+pub fn get_test_pkh() -> &'static str {
+    "pkh(cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMm)"
 }
 
 /// `wpkh` single key descriptor

wallet/src/wallet/coin_selection.rs

@@ -204,12 +204,12 @@ pub trait CoinSelectionAlgorithm: core::fmt::Debug {
     /// Perform the coin selection
     ///
     /// - `required_utxos`: the utxos that must be spent regardless of `target_amount` with their
-    ///                     weight cost
+    ///   weight cost
     /// - `optional_utxos`: the remaining available utxos to satisfy `target_amount` with their
-    ///                     weight cost
+    ///   weight cost
     /// - `fee_rate`: fee rate to use
     /// - `target_amount`: the outgoing amount and the fees already accumulated from adding
-    ///                    outputs and transaction’s header.
+    ///   outputs and transaction’s header.
     /// - `drain_script`: the script to use in case of change
     /// - `rand`: random number generated used by some coin selection algorithms such as [`SingleRandomDraw`]
     fn coin_select<R: RngCore>(

wallet/src/wallet/persisted.rs

@@ -112,11 +112,11 @@ pub trait AsyncWalletPersister {
 ///
 /// * Ensure the persister is initialized before data is persisted.
 /// * Ensure there were no previously persisted wallet data before creating a fresh wallet and
-///     persisting it.
+///   persisting it.
 /// * Only clear the staged changes of [`Wallet`] after persisting succeeds.
 /// * Ensure the wallet is persisted to the same `P` type as when created/loaded. Note that this is
-///     not completely fool-proof as you can have multiple instances of the same `P` type that are
-///     connected to different databases.
+///   not completely fool-proof as you can have multiple instances of the same `P` type that are
+///   connected to different databases.
 #[derive(Debug)]
 pub struct PersistedWallet<P> {
     inner: Wallet,

wallet/tests/psbt.rs

@@ -143,7 +143,7 @@ fn test_psbt_fee_rate_with_missing_txout() {
 
     let desc = "pkh(tprv8ZgxMBicQKsPd3EupYiPRhaMooHKUHJxNsTfYuScep13go8QFfHdtkG9nRkFGb7busX4isf6X9dURGCoKgitaApQ6MupRhZMcELAxTBRJgS/0)";
     let change_desc = "pkh(tprv8ZgxMBicQKsPd3EupYiPRhaMooHKUHJxNsTfYuScep13go8QFfHdtkG9nRkFGb7busX4isf6X9dURGCoKgitaApQ6MupRhZMcELAxTBRJgS/1)";
-    let (mut pkh_wallet, _) = get_funded_wallet(desc, change_desc);
+    let (mut pkh_wallet, _) = get_funded_wallet(desc, Some(change_desc));
     let addr = pkh_wallet.peek_address(KeychainKind::External, 0);
     let mut builder = pkh_wallet.build_tx();
     builder.drain_to(addr.script_pubkey()).drain_wallet();
@@ -172,7 +172,7 @@ fn test_psbt_multiple_internalkey_signers() {
     let keypair = Keypair::from_secret_key(&secp, &prv.inner);
 
     let change_desc = "tr(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW)";
-    let (mut wallet, _) = get_funded_wallet(&desc, change_desc);
+    let (mut wallet, _) = get_funded_wallet(&desc, Some(change_desc));
     let to_spend = wallet.balance().total();
     let send_to = wallet.peek_address(KeychainKind::External, 0);
     let mut builder = wallet.build_tx();