Fix tests for new API.

Author: rajarshimaitra

crates/bdk/tests/wallet.rs

@@ -437,7 +437,7 @@ fn test_create_tx_drain_to_and_utxos() {
     let utxos: Vec<_> = wallet
         .list_unspent()
         .into_iter()
-        .map(|u| u.outpoint)
+        .map(|(u, k)| (u.outpoint, k))
         .collect();
     let mut builder = wallet.build_tx();
     builder
@@ -818,10 +818,13 @@ fn test_create_tx_add_utxo() {
     let mut builder = wallet.build_tx();
     builder
         .add_recipient(addr.script_pubkey(), 30_000)
-        .add_utxo(OutPoint {
-            txid: small_output_tx.txid(),
-            vout: 0,
-        })
+        .add_utxo(
+            OutPoint {
+                txid: small_output_tx.txid(),
+                vout: 0,
+            },
+            KeychainKind::External,
+        )
         .unwrap();
     let (psbt, details) = builder.finish().unwrap();
 
@@ -855,10 +858,13 @@ fn test_create_tx_manually_selected_insufficient() {
     let mut builder = wallet.build_tx();
     builder
         .add_recipient(addr.script_pubkey(), 30_000)
-        .add_utxo(OutPoint {
-            txid: small_output_tx.txid(),
-            vout: 0,
-        })
+        .add_utxo(
+            OutPoint {
+                txid: small_output_tx.txid(),
+                vout: 0,
+            },
+            KeychainKind::External,
+        )
         .unwrap()
         .manually_selected_only();
     builder.finish().unwrap();
@@ -972,9 +978,10 @@ fn test_add_foreign_utxo() {
         get_funded_wallet("wpkh(cVbZ8ovhye9AoAHFsqobCf7LxbXDAECy9Kb8TZdfsDYMZGBUyCnm)");
 
     let addr = Address::from_str("2N1Ffz3WaNzbeLFBb51xyFMHYSEUXcbiSoX").unwrap();
-    let utxo = wallet2.list_unspent().remove(0);
+    let (utxo, _) = wallet2.list_unspent().remove(0);
     let foreign_utxo_satisfaction = wallet2
         .get_descriptor_for_keychain(KeychainKind::External)
+        .unwrap()
         .max_satisfaction_weight()
         .unwrap();
 
@@ -1036,9 +1043,10 @@ fn test_add_foreign_utxo() {
 #[should_panic(expected = "Generic(\"Foreign utxo missing witness_utxo or non_witness_utxo\")")]
 fn test_add_foreign_utxo_invalid_psbt_input() {
     let (mut wallet, _) = get_funded_wallet(get_test_wpkh());
-    let outpoint = wallet.list_unspent()[0].outpoint;
+    let outpoint = wallet.list_unspent()[0].0.outpoint;
     let foreign_utxo_satisfaction = wallet
         .get_descriptor_for_keychain(KeychainKind::External)
+        .unwrap()
         .max_satisfaction_weight()
         .unwrap();
 
@@ -1054,12 +1062,13 @@ fn test_add_foreign_utxo_where_outpoint_doesnt_match_psbt_input() {
     let (wallet2, txid2) =
         get_funded_wallet("wpkh(cVbZ8ovhye9AoAHFsqobCf7LxbXDAECy9Kb8TZdfsDYMZGBUyCnm)");
 
-    let utxo2 = wallet2.list_unspent().remove(0);
+    let (utxo2, _) = wallet2.list_unspent().remove(0);
     let tx1 = wallet1.get_tx(txid1, true).unwrap().transaction.unwrap();
     let tx2 = wallet2.get_tx(txid2, true).unwrap().transaction.unwrap();
 
     let satisfaction_weight = wallet2
         .get_descriptor_for_keychain(KeychainKind::External)
+        .unwrap()
         .max_satisfaction_weight()
         .unwrap();
 
@@ -1098,10 +1107,11 @@ fn test_add_foreign_utxo_only_witness_utxo() {
     let (wallet2, txid2) =
         get_funded_wallet("wpkh(cVbZ8ovhye9AoAHFsqobCf7LxbXDAECy9Kb8TZdfsDYMZGBUyCnm)");
     let addr = Address::from_str("2N1Ffz3WaNzbeLFBb51xyFMHYSEUXcbiSoX").unwrap();
-    let utxo2 = wallet2.list_unspent().remove(0);
+    let (utxo2, _) = wallet2.list_unspent().remove(0);
 
     let satisfaction_weight = wallet2
         .get_descriptor_for_keychain(KeychainKind::External)
+        .unwrap()
         .max_satisfaction_weight()
         .unwrap();
 
@@ -1160,7 +1170,7 @@ fn test_add_foreign_utxo_only_witness_utxo() {
 fn test_get_psbt_input() {
     // this should grab a known good utxo and set the input
     let (wallet, _) = get_funded_wallet(get_test_wpkh());
-    for utxo in wallet.list_unspent() {
+    for (utxo, _) in wallet.list_unspent() {
         let psbt_input = wallet.get_psbt_input(utxo, None, false).unwrap();
         assert!(psbt_input.witness_utxo.is_some() || psbt_input.non_witness_utxo.is_some());
     }
@@ -1478,10 +1488,13 @@ fn test_bump_fee_drain_wallet() {
     let mut builder = wallet.build_tx();
     builder
         .drain_to(addr.script_pubkey())
-        .add_utxo(OutPoint {
-            txid: tx.txid(),
-            vout: 0,
-        })
+        .add_utxo(
+            OutPoint {
+                txid: tx.txid(),
+                vout: 0,
+            },
+            KeychainKind::External,
+        )
         .unwrap()
         .manually_selected_only()
         .enable_rbf();
@@ -1533,7 +1546,7 @@ fn test_bump_fee_remove_output_manually_selected_only() {
     let mut builder = wallet.build_tx();
     builder
         .drain_to(addr.script_pubkey())
-        .add_utxo(outpoint)
+        .add_utxo(outpoint, KeychainKind::External)
         .unwrap()
         .manually_selected_only()
         .enable_rbf();
@@ -1660,7 +1673,7 @@ fn test_bump_fee_no_change_add_input_and_change() {
     let mut builder = wallet.build_tx();
     builder
         .drain_to(addr.script_pubkey())
-        .add_utxo(op)
+        .add_utxo(op, KeychainKind::External)
         .unwrap()
         .manually_selected_only()
         .enable_rbf();
@@ -1790,7 +1803,7 @@ fn test_bump_fee_force_add_input() {
     // the addition of an extra input with `add_utxo()`
     let mut builder = wallet.build_fee_bump(txid).unwrap();
     builder
-        .add_utxo(incoming_op)
+        .add_utxo(incoming_op, KeychainKind::External)
         .unwrap()
         .fee_rate(FeeRate::from_sat_per_vb(5.0));
     let (psbt, details) = builder.finish().unwrap();
@@ -1845,7 +1858,10 @@ fn test_bump_fee_absolute_force_add_input() {
     // the new fee_rate is low enough that just reducing the change would be fine, but we force
     // the addition of an extra input with `add_utxo()`
     let mut builder = wallet.build_fee_bump(txid).unwrap();
-    builder.add_utxo(incoming_op).unwrap().fee_absolute(250);
+    builder
+        .add_utxo(incoming_op, KeychainKind::External)
+        .unwrap()
+        .fee_absolute(250);
     let (psbt, details) = builder.finish().unwrap();
 
     assert_eq!(details.sent, original_details.sent + 25_000);
@@ -1956,7 +1972,7 @@ fn test_fee_amount_negative_drain_val() {
     let mut builder = wallet.build_tx();
     builder
         .add_recipient(send_to.script_pubkey(), 8630)
-        .add_utxo(incoming_op)
+        .add_utxo(incoming_op, KeychainKind::External)
         .unwrap()
         .enable_rbf()
         .fee_rate(fee_rate);
@@ -2660,10 +2676,11 @@ fn test_taproot_foreign_utxo() {
     let (wallet2, _) = get_funded_wallet(get_test_tr_single_sig());
 
     let addr = Address::from_str("2N1Ffz3WaNzbeLFBb51xyFMHYSEUXcbiSoX").unwrap();
-    let utxo = wallet2.list_unspent().remove(0);
+    let (utxo, _) = wallet2.list_unspent().remove(0);
     let psbt_input = wallet2.get_psbt_input(utxo.clone(), None, false).unwrap();
     let foreign_utxo_satisfaction = wallet2
         .get_descriptor_for_keychain(KeychainKind::External)
+        .unwrap()
         .max_satisfaction_weight()
         .unwrap();