From 3a80e87ccb060af0870f3404f90ea04431f1d132 Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Mon, 19 Oct 2020 16:58:55 -0700
Subject: [PATCH] [descriptor] Fix compile errors after rebase

---
 src/descriptor/dsl.rs      | 2 +-
 src/descriptor/policy.rs   | 6 +++---
 src/descriptor/template.rs | 2 +-
 src/lib.rs                 | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/descriptor/dsl.rs b/src/descriptor/dsl.rs
index da4c5d24..9b7ef1e2 100644
--- 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 55b9b9a0..1b7e3bff 100644
--- 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 64a4a399..de4dd620 100644
--- 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 d946c4f6..69fc670e 100644
--- 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]