Do not use blockdata:: in bitcoin paths

Author: tcharding

examples/sign_multisig.rs

@@ -5,7 +5,7 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
-use bitcoin::blockdata::witness::Witness;
+use bitcoin::witness::Witness;
 use bitcoin::{absolute, ecdsa, transaction, Amount, Sequence};
 
 fn main() {

fuzz/fuzz_targets/roundtrip_miniscript_script.rs

@@ -1,7 +1,7 @@
 #![allow(unexpected_cfgs)]
 
 use honggfuzz::fuzz;
-use miniscript::bitcoin::blockdata::script;
+use miniscript::bitcoin::script;
 use miniscript::{Miniscript, Segwitv0};
 
 fn do_test(data: &[u8]) {

src/descriptor/mod.rs

@@ -1000,13 +1000,11 @@ pub(crate) use write_descriptor;
 mod tests {
     use core::convert::TryFrom;
 
-    use bitcoin::blockdata::opcodes::all::{OP_CLTV, OP_CSV};
-    use bitcoin::blockdata::script::Instruction;
-    use bitcoin::blockdata::{opcodes, script};
     use bitcoin::hashes::hex::FromHex;
-    use bitcoin::script::PushBytes;
+    use bitcoin::opcodes::all::{OP_CLTV, OP_CSV};
+    use bitcoin::script::{Instruction, PushBytes};
     use bitcoin::sighash::EcdsaSighashType;
-    use bitcoin::{bip32, PublicKey, Sequence};
+    use bitcoin::{bip32, opcodes, script, PublicKey, Sequence};
 
     use super::checksum::desc_checksum;
     use super::*;

src/descriptor/tr.rs

@@ -357,7 +357,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Tr<Pk> {
     /// Obtains the corresponding script pubkey for this descriptor.
     pub fn script_pubkey(&self) -> ScriptBuf {
         let output_key = self.spend_info().output_key();
-        let builder = bitcoin::blockdata::script::Builder::new();
+        let builder = bitcoin::script::Builder::new();
         builder
             .push_opcode(opcodes::all::OP_PUSHNUM_1)
             .push_slice(output_key.serialize())

src/interpreter/inner.rs

@@ -392,10 +392,9 @@ mod tests {
     use core::convert::TryFrom;
     use core::str::FromStr;
 
-    use bitcoin::blockdata::script;
     use bitcoin::hashes::hex::FromHex;
     use bitcoin::script::PushBytes;
-    use bitcoin::ScriptBuf;
+    use bitcoin::{script, ScriptBuf};
 
     use super::*;
 

src/interpreter/stack.rs

@@ -3,9 +3,8 @@
 
 //! Interpreter stack
 
-use bitcoin::blockdata::{opcodes, script};
 use bitcoin::hashes::{hash160, ripemd160, sha256};
-use bitcoin::{absolute, relative, Sequence};
+use bitcoin::{absolute, opcodes, relative, script, Sequence};
 
 use super::error::PkEvalErrInner;
 use super::{verify_sersig, BitcoinKey, Error, HashLockType, KeySigPair, SatisfiedConstraint};
@@ -50,7 +49,7 @@ impl<'txin> Element<'txin> {
     ///
     /// Supports `OP_1` but no other numbers since these are not used by Miniscript
     pub fn from_instruction(
-        ins: Result<script::Instruction<'txin>, bitcoin::blockdata::script::Error>,
+        ins: Result<script::Instruction<'txin>, bitcoin::script::Error>,
     ) -> Result<Self, Error> {
         match ins {
             //Also covers the dissatisfied case as PushBytes0

src/miniscript/lex.rs

@@ -7,7 +7,7 @@
 
 use core::fmt;
 
-use bitcoin::blockdata::{opcodes, script};
+use bitcoin::{opcodes, script};
 
 use super::Error;
 use crate::prelude::*;

src/plan.rs

@@ -271,7 +271,7 @@ impl Plan {
         &self,
         stfr: &Sat,
     ) -> Result<(Vec<Vec<u8>>, ScriptBuf), Error> {
-        use bitcoin::blockdata::script::Builder;
+        use bitcoin::script::Builder;
 
         let stack = self
             .template

src/policy/compiler.rs

@@ -1200,8 +1200,7 @@ where
 mod tests {
     use core::str::FromStr;
 
-    use bitcoin::blockdata::{opcodes, script};
-    use bitcoin::hashes;
+    use bitcoin::{hashes, opcodes, script};
 
     use super::*;
     use crate::miniscript::{Legacy, Segwitv0, Tap};