Multi descriptor: Decouple transaction building logic

.gitignore

@@ -3,3 +3,6 @@ Cargo.lock
 
 *.swp
 .idea
+
+# IDE
+/.vscode

src/database/memory.rs

@@ -555,6 +555,7 @@ macro_rules! doctest_wallet {
         use $crate::bitcoin::Network;
         use $crate::database::MemoryDatabase;
         use $crate::testutils;
+
         let descriptor = "wpkh(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW)";
         let descriptors = testutils!(@descriptors (descriptor) (descriptor));
 
@@ -567,13 +568,17 @@ macro_rules! doctest_wallet {
             Some(100),
         );
 
-        $crate::Wallet::new(
+        let wallet = $crate::Wallet::new(
             &descriptors.0,
             descriptors.1.as_ref(),
             Network::Regtest,
             db
         )
-        .unwrap()
+        .unwrap();
+
+        wallet.ensure_addresses_cached(10).unwrap();
+
+        wallet
     }}
 }
 

src/error.rs

@@ -73,8 +73,8 @@ pub enum Error {
     Key(crate::keys::KeyError),
     /// Descriptor checksum mismatch
     ChecksumMismatch,
-    /// Spending policy is not compatible with this [`KeychainKind`](crate::types::KeychainKind)
-    SpendingPolicyRequired(crate::types::KeychainKind),
+    /// Spending policy is not compatible with this [`ExtendedDescriptor`](crate::descriptor::ExtendedDescriptor)
+    SpendingPolicyRequired(Box<crate::descriptor::ExtendedDescriptor>),
     /// Error while extracting and manipulating policies
     InvalidPolicyPathError(crate::descriptor::policy::PolicyError),
     /// Signing error

src/testutils/blockchain_tests.rs

@@ -1328,8 +1328,8 @@ macro_rules! bdk_blockchain_tests {
                 let tx = {
                     let mut builder = wallet.build_tx();
                     builder.add_recipient(test_client.get_node_address(None).script_pubkey(), 25_000)
-                        .policy_path(ext_path, KeychainKind::External)
-                        .policy_path(int_path, KeychainKind::Internal);
+                        .policy_path(ext_path, wallet.get_descriptor_for_keychain(KeychainKind::External))
+                        .policy_path(int_path, wallet.get_descriptor_for_keychain(KeychainKind::Internal));
                     let (mut psbt, _details) = builder.finish().unwrap();
                     wallet.sign(&mut psbt, Default::default()).unwrap();
                     psbt.extract_tx()