diff --git a/src/testutils/mod.rs b/src/testutils/mod.rs index 3e4dfec2..80f0d253 100644 --- a/src/testutils/mod.rs +++ b/src/testutils/mod.rs @@ -100,8 +100,8 @@ impl TranslateDescriptor for Descriptor { #[macro_export] macro_rules! testutils { ( @external $descriptors:expr, $child:expr ) => ({ - use bitcoin::secp256k1::Secp256k1; - use miniscript::descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait}; + use $crate::bitcoin::secp256k1::Secp256k1; + use $crate::miniscript::descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait}; use $crate::testutils::TranslateDescriptor; @@ -111,15 +111,15 @@ macro_rules! testutils { parsed.derive_translated(&secp, $child).address(bitcoin::Network::Regtest).expect("No address form") }); ( @internal $descriptors:expr, $child:expr ) => ({ - use bitcoin::secp256k1::Secp256k1; - use miniscript::descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait}; + use $crate::bitcoin::secp256k1::Secp256k1; + use $crate::miniscript::descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait}; use $crate::testutils::TranslateDescriptor; let secp = Secp256k1::new(); let parsed = Descriptor::::parse_descriptor(&secp, &$descriptors.1.expect("Missing internal descriptor")).expect("Failed to parse descriptor in `testutils!(@internal)`").0; - parsed.derive_translated(&secp, $child).address(bitcoin::Network::Regtest).expect("No address form") + parsed.derive_translated(&secp, $child).address($crate::bitcoin::Network::Regtest).expect("No address form") }); ( @e $descriptors:expr, $child:expr ) => ({ testutils!(@external $descriptors, $child) }); ( @i $descriptors:expr, $child:expr ) => ({ testutils!(@internal $descriptors, $child) }); @@ -145,8 +145,8 @@ macro_rules! testutils { let mut seed = [0u8; 32]; rand::thread_rng().fill(&mut seed[..]); - let key = bitcoin::util::bip32::ExtendedPrivKey::new_master( - bitcoin::Network::Testnet, + let key = $crate::bitcoin::util::bip32::ExtendedPrivKey::new_master( + $crate::bitcoin::Network::Testnet, &seed, ); @@ -158,13 +158,13 @@ macro_rules! testutils { ( @generate_wif ) => ({ use rand::Rng; - let mut key = [0u8; bitcoin::secp256k1::constants::SECRET_KEY_SIZE]; + let mut key = [0u8; $crate::bitcoin::secp256k1::constants::SECRET_KEY_SIZE]; rand::thread_rng().fill(&mut key[..]); - (bitcoin::PrivateKey { + ($crate::bitcoin::PrivateKey { compressed: true, - network: bitcoin::Network::Testnet, - key: bitcoin::secp256k1::SecretKey::from_slice(&key).unwrap(), + network: $crate::bitcoin::Network::Testnet, + key: $crate::bitcoin::secp256k1::SecretKey::from_slice(&key).unwrap(), }.to_string(), None::, None::) }); @@ -181,8 +181,8 @@ macro_rules! testutils { ( @descriptors ( $external_descriptor:expr ) $( ( $internal_descriptor:expr ) )? $( ( @keys $( $keys:tt )* ) )* ) => ({ use std::str::FromStr; use std::collections::HashMap; - use miniscript::descriptor::Descriptor; - use miniscript::TranslatePk; + use $crate::miniscript::descriptor::Descriptor; + use $crate::miniscript::TranslatePk; #[allow(unused_assignments, unused_mut)] let mut keys: HashMap<&'static str, (String, Option, Option)> = HashMap::new();