[descriptor] Fix compile errors after rebase

diff --git a/src/descriptor/dsl.rs b/src/descriptor/dsl.rs
index da4c5d24dc417e2d6ac6eefbc4102a613caf39b4..9b7ef1e20a890c4726db1ebabd4970c4a9e2e005 100644 (file)
--- a/src/descriptor/dsl.rs
+++ b/src/descriptor/dsl.rs
@@ -434,7 +434,7 @@ mod test {
             let child_desc = if desc.is_fixed() {
                 desc.clone()
             } else {
-                desc.derive(&[ChildNumber::from_normal_idx(index).unwrap()])
+                desc.derive(ChildNumber::from_normal_idx(index).unwrap())
             };
             let address = child_desc.address(Regtest);
             if address.is_some() {

diff --git a/src/descriptor/policy.rs b/src/descriptor/policy.rs
index 55b9b9a0e8fa56c23d08530fbdad80b7dd20ee93..1b7e3bff2ee67e35d8324e2b01cdc73cd7a4ca5d 100644 (file)
--- a/src/descriptor/policy.rs
+++ b/src/descriptor/policy.rs
@@ -980,7 +980,7 @@ mod test {
         let (prvkey, pubkey, fingerprint) = setup_keys(TPRV0_STR);
         let desc = descriptor!(wpkh(pubkey)).unwrap();
         let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap();
-        let single_key = wallet_desc.derive(&[ChildNumber::from_normal_idx(0).unwrap()]);
+        let single_key = wallet_desc.derive(ChildNumber::from_normal_idx(0).unwrap());
         let signers_container = Arc::new(SignersContainer::from(keymap));
         let policy = single_key
             .extract_policy(signers_container)
@@ -994,7 +994,7 @@ mod test {
 
         let desc = descriptor!(wpkh(prvkey)).unwrap();
         let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap();
-        let single_key = wallet_desc.derive(&[ChildNumber::from_normal_idx(0).unwrap()]);
+        let single_key = wallet_desc.derive(ChildNumber::from_normal_idx(0).unwrap());
         let signers_container = Arc::new(SignersContainer::from(keymap));
         let policy = single_key
             .extract_policy(signers_container)
@@ -1016,7 +1016,7 @@ mod test {
         let (prvkey1, _pubkey1, fingerprint1) = setup_keys(TPRV1_STR);
         let desc = descriptor!(sh(multi 1, pubkey0, prvkey1)).unwrap();
         let (wallet_desc, keymap) = desc.to_wallet_descriptor(Network::Testnet).unwrap();
-        let single_key = wallet_desc.derive(&[ChildNumber::from_normal_idx(0).unwrap()]);
+        let single_key = wallet_desc.derive(ChildNumber::from_normal_idx(0).unwrap());
         let signers_container = Arc::new(SignersContainer::from(keymap));
         let policy = single_key
             .extract_policy(signers_container)

diff --git a/src/descriptor/template.rs b/src/descriptor/template.rs
index 64a4a3997aaf835fe94c52ad29cd407d839682c2..de4dd62069a66c05075551cc5760ebc355bdd7f5 100644 (file)
--- a/src/descriptor/template.rs
+++ b/src/descriptor/template.rs
@@ -451,7 +451,7 @@ mod test {
             let child_desc = if desc.is_fixed() {
                 desc.clone()
             } else {
-                desc.derive(&[ChildNumber::from_normal_idx(index).unwrap()])
+                desc.derive(ChildNumber::from_normal_idx(index).unwrap())
             };
             let address = child_desc.address(Regtest).unwrap();
             assert_eq!(address.to_string(), *expected.get(i).unwrap());

diff --git a/src/lib.rs b/src/lib.rs
index d946c4f6aec0a8932b94497a4d9e52ef55496f29..69fc670e60fd254ce6286053a7cbdd3c93f5b35a 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,6 +66,9 @@ pub mod cli;
 extern crate testutils;
 #[cfg(test)]
 #[macro_use]
+extern crate testutils_macros;
+#[cfg(test)]
+#[macro_use]
 extern crate serial_test;
 
 #[macro_use]