-use bitcoin_hashes::sha256d::Hash as Sha256dHash;
+use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::transaction::Transaction;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
-use secp256k1::key::PublicKey;
+use bitcoin::secp256k1::key::PublicKey;
use utils::test_logger;