Move extension trait imports to test modules

Author: tcharding

src/descriptor/mod.rs

@@ -16,7 +16,7 @@ use core::ops::Range;
 use core::str::{self, FromStr};
 
 use bitcoin::hashes::{hash160, ripemd160, sha256};
-use bitcoin::script::{ScriptBufExt, ScriptExt, WitnessScriptExt, ScriptPubKey, ScriptPubKeyBuf, ScriptSigBuf};
+use bitcoin::script::{ScriptPubKey, ScriptPubKeyBuf, ScriptSigBuf};
 use bitcoin::{
     secp256k1, Address, Network, TxIn, Weight, Witness, WitnessVersion,
 };
@@ -1116,7 +1116,7 @@ mod tests {
     use bitcoin::blockdata::opcodes::all::{OP_CLTV, OP_CSV};
     use bitcoin::blockdata::script::Instruction;
     use bitcoin::blockdata::{opcodes, script};
-    use bitcoin::script::{PushBytes, ScriptPubKeyBuf, ScriptSigBuf};
+    use bitcoin::script::{PushBytes, ScriptPubKeyBuf, ScriptSigBuf, WitnessScriptExt, ScriptExt, ScriptBufExt};
     use bitcoin::sighash::EcdsaSighashType;
     use bitcoin::{bip32, PublicKey, Sequence, XOnlyPublicKey};
 

src/interpreter/mod.rs

@@ -1054,8 +1054,6 @@ fn verify_sersig<'txin>(
 #[cfg(test)]
 mod tests {
 
-    use bitcoin::secp256k1::Secp256k1;
-
     use super::inner::ToNoChecks;
     use super::*;
     use crate::miniscript::analyzable::ExtParams;
@@ -1068,12 +1066,10 @@ mod tests {
         Vec<Vec<u8>>,
         Vec<bitcoin::ecdsa::Signature>,
         secp256k1::Message,
-        Secp256k1<secp256k1::All>,
         Vec<bitcoin::XOnlyPublicKey>,
         Vec<bitcoin::taproot::Signature>,
         Vec<Vec<u8>>,
     ) {
-        let secp = secp256k1::Secp256k1::new();
         let msg = secp256k1::Message::from_digest(*b"Yoda: btc, I trust. HODL I must!");
         let mut pks = vec![];
         let mut ecdsa_sigs = vec![];
@@ -1114,12 +1110,12 @@ mod tests {
             ser_schnorr_sigs.push(schnorr_sig.to_vec());
             schnorr_sigs.push(schnorr_sig);
         }
-        (pks, der_sigs, ecdsa_sigs, msg, secp, x_only_pks, schnorr_sigs, ser_schnorr_sigs)
+        (pks, der_sigs, ecdsa_sigs, msg, x_only_pks, schnorr_sigs, ser_schnorr_sigs)
     }
 
     #[test]
     fn sat_constraints() {
-        let (pks, der_sigs, ecdsa_sigs, sighash, secp, xpks, schnorr_sigs, ser_schnorr_sigs) =
+        let (pks, der_sigs, ecdsa_sigs, sighash, xpks, schnorr_sigs, ser_schnorr_sigs) =
             setup_keys_sigs(10);
         let vfyfn = |pksig: &KeySigPair| match pksig {
             KeySigPair::Ecdsa(pk, ecdsa_sig) =>

src/psbt/mod.rs

@@ -19,7 +19,7 @@ use bitcoin::secp256k1;
 use bitcoin::secp256k1::{Secp256k1, VerifyOnly};
 use bitcoin::sighash::{self, SighashCache};
 use bitcoin::taproot::{self, ControlBlock, LeafVersion, TapLeafHash};
-use bitcoin::script::{RedeemScriptBuf, ScriptBufExt, ScriptExt, ScriptPubKey, ScriptPubKeyBuf, ScriptPubKeyExt, TapScriptBuf, WitnessScriptBuf, WitnessScriptExt};
+use bitcoin::script::{RedeemScriptBuf, ScriptExt, ScriptPubKey, ScriptPubKeyBuf, ScriptPubKeyExt, TapScriptBuf, WitnessScriptBuf, WitnessScriptExt};
 use bitcoin::transaction::TxInExt;
 use bitcoin::{absolute, bip32, relative, transaction};
 
@@ -1386,7 +1386,7 @@ mod tests {
 
     use bitcoin::bip32::{DerivationPath, Xpub};
     use bitcoin::consensus::encode::deserialize;
-    use bitcoin::script::{self, ScriptPubKeyBuf};
+    use bitcoin::script::{self, ScriptPubKeyBuf, ScriptBufExt};
     use bitcoin::secp256k1::PublicKey;
     use bitcoin::{Amount, OutPoint, TxIn, TxOut, XOnlyPublicKey};
     use hex;