Skip to content

Commit e9b20ce

Browse files
tchardingtcharding
committed
Do not use bitcoin::blockdata
The `rust-bitcoin` project is working towards making the public API separate from the directory structure; eventually the `bitcoin::blockdata` will go away, to make maintenance easier here stop using the `blockdata` module. Do not run the formatter, so as to make review easier. This patch was created mechanically using: search-and-replace bitcoin::blockdata bitcoin and having defined ```bash search-and-replace () { if (($# != 2)) then echo "Usage: $0 <this> <that>" return fi local this="$1" local that="$2" for file in $(git grep -l "$this") do perl -pi -e "s/$this/$that/g" "$file" done } ```
1 parent 0d2fe67 commit e9b20ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+173
-173
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
//! channel being force-closed.
2020
2121
use bitcoin::amount::Amount;
22-
use bitcoin::blockdata::constants::genesis_block;
23-
use bitcoin::blockdata::locktime::absolute::LockTime;
24-
use bitcoin::blockdata::opcodes;
25-
use bitcoin::blockdata::script::{Builder, ScriptBuf};
26-
use bitcoin::blockdata::transaction::{Transaction, TxOut};
22+
use bitcoin::constants::genesis_block;
23+
use bitcoin::locktime::absolute::LockTime;
24+
use bitcoin::opcodes;
25+
use bitcoin::script::{Builder, ScriptBuf};
26+
use bitcoin::transaction::{Transaction, TxOut};
2727
use bitcoin::network::Network;
2828
use bitcoin::transaction::Version;
2929

‎fuzz/src/full_stack.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
//! This test has been very useful, though due to its complexity good starting inputs are critical.
1515
1616
use bitcoin::amount::Amount;
17-
use bitcoin::blockdata::constants::genesis_block;
18-
use bitcoin::blockdata::locktime::absolute::LockTime;
19-
use bitcoin::blockdata::opcodes;
20-
use bitcoin::blockdata::script::{Builder, ScriptBuf};
21-
use bitcoin::blockdata::transaction::{Transaction, TxOut};
17+
use bitcoin::constants::genesis_block;
18+
use bitcoin::locktime::absolute::LockTime;
19+
use bitcoin::opcodes;
20+
use bitcoin::script::{Builder, ScriptBuf};
21+
use bitcoin::transaction::{Transaction, TxOut};
2222
use bitcoin::consensus::encode::deserialize;
2323
use bitcoin::network::Network;
2424
use bitcoin::transaction::Version;

‎fuzz/src/onion_message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Imports that need to be added manually
22
use bech32::u5;
3-
use bitcoin::blockdata::script::ScriptBuf;
3+
use bitcoin::script::ScriptBuf;
44
use bitcoin::secp256k1::ecdh::SharedSecret;
55
use bitcoin::secp256k1::ecdsa::RecoverableSignature;
66
use bitcoin::secp256k1::schnorr;

‎fuzz/src/router.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
// licenses.
99

1010
use bitcoin::amount::Amount;
11-
use bitcoin::blockdata::constants::ChainHash;
12-
use bitcoin::blockdata::script::Builder;
13-
use bitcoin::blockdata::transaction::TxOut;
11+
use bitcoin::constants::ChainHash;
12+
use bitcoin::script::Builder;
13+
use bitcoin::transaction::TxOut;
1414

1515
use lightning::blinded_path::{BlindedHop, BlindedPath, IntroductionNode};
1616
use lightning::chain::transaction::OutPoint;

‎lightning-background-processor/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,9 +1011,9 @@ impl Drop for BackgroundProcessor {
10111011
#[cfg(all(feature = "std", test))]
10121012
mod tests {
10131013
use super::{BackgroundProcessor, GossipSync, FRESHNESS_TIMER};
1014-
use bitcoin::blockdata::constants::{genesis_block, ChainHash};
1015-
use bitcoin::blockdata::locktime::absolute::LockTime;
1016-
use bitcoin::blockdata::transaction::{Transaction, TxOut};
1014+
use bitcoin::constants::{genesis_block, ChainHash};
1015+
use bitcoin::locktime::absolute::LockTime;
1016+
use bitcoin::transaction::{Transaction, TxOut};
10171017
use bitcoin::hashes::Hash;
10181018
use bitcoin::network::Network;
10191019
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};

‎lightning-block-sync/src/convert.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::http::{BinaryResponse, JsonResponse};
22
use crate::utils::hex_to_work;
33
use crate::{BlockHeaderData, BlockSourceError};
44

5-
use bitcoin::blockdata::block::{Block, Header};
5+
use bitcoin::block::{Block, Header};
66
use bitcoin::consensus::encode;
77
use bitcoin::hash_types::{BlockHash, TxMerkleNode, Txid};
88
use bitcoin::hashes::hex::FromHex;
@@ -95,7 +95,7 @@ impl TryFrom<serde_json::Value> for BlockHeaderData {
9595

9696
Ok(BlockHeaderData {
9797
header: Header {
98-
version: bitcoin::blockdata::block::Version::from_consensus(
98+
version: bitcoin::block::Version::from_consensus(
9999
get_field!("version", as_i64).try_into().map_err(|_| ())?,
100100
),
101101
prev_blockhash: if let Some(hash_str) = response.get("previousblockhash") {
@@ -292,7 +292,7 @@ impl TryInto<GetUtxosResponse> for JsonResponse {
292292
#[cfg(test)]
293293
pub(crate) mod tests {
294294
use super::*;
295-
use bitcoin::blockdata::constants::genesis_block;
295+
use bitcoin::constants::genesis_block;
296296
use bitcoin::hashes::Hash;
297297
use bitcoin::network::Network;
298298
use hex::DisplayHex;

‎lightning-block-sync/src/gossip.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
55
use crate::{AsyncBlockSourceResult, BlockData, BlockSource, BlockSourceError};
66

7-
use bitcoin::blockdata::block::Block;
8-
use bitcoin::blockdata::constants::ChainHash;
9-
use bitcoin::blockdata::transaction::{OutPoint, TxOut};
7+
use bitcoin::block::Block;
8+
use bitcoin::constants::ChainHash;
9+
use bitcoin::transaction::{OutPoint, TxOut};
1010
use bitcoin::hash_types::BlockHash;
1111

1212
use lightning::ln::peer_handler::APeerManager;

‎lightning-block-sync/src/init.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use crate::poll::{ChainPoller, Validate, ValidatedBlockHeader};
55
use crate::{BlockSource, BlockSourceResult, Cache, ChainNotifier};
66

7-
use bitcoin::blockdata::block::Header;
7+
use bitcoin::block::Header;
88
use bitcoin::hash_types::BlockHash;
99
use bitcoin::network::Network;
1010

‎lightning-block-sync/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mod utils;
4444

4545
use crate::poll::{ChainTip, Poll, ValidatedBlockHeader};
4646

47-
use bitcoin::blockdata::block::{Block, Header};
47+
use bitcoin::block::{Block, Header};
4848
use bitcoin::hash_types::BlockHash;
4949
use bitcoin::pow::Work;
5050

‎lightning-block-sync/src/test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use crate::{
44
UnboundedCache,
55
};
66

7-
use bitcoin::blockdata::block::{Block, Header, Version};
8-
use bitcoin::blockdata::constants::genesis_block;
9-
use bitcoin::blockdata::locktime::absolute::LockTime;
7+
use bitcoin::block::{Block, Header, Version};
8+
use bitcoin::constants::genesis_block;
9+
use bitcoin::locktime::absolute::LockTime;
1010
use bitcoin::hash_types::{BlockHash, TxMerkleNode};
1111
use bitcoin::network::Network;
1212
use bitcoin::transaction;

‎lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ mod test {
13291329
} else {
13301330
None
13311331
};
1332-
let genesis_timestamp = bitcoin::blockdata::constants::genesis_block(bitcoin::Network::Testnet).header.time as u64;
1332+
let genesis_timestamp = bitcoin::constants::genesis_block(bitcoin::Network::Testnet).header.time as u64;
13331333
let non_default_invoice_expiry_secs = 4200;
13341334

13351335
let invoice =

‎lightning-net-tokio/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ impl Hash for SocketDescriptor {
620620

621621
#[cfg(test)]
622622
mod tests {
623-
use bitcoin::blockdata::constants::ChainHash;
623+
use bitcoin::constants::ChainHash;
624624
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
625625
use bitcoin::Network;
626626
use lightning::events::*;

‎lightning-rapid-gossip-sync/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
//! from disk, which we do by calling [`RapidGossipSync::update_network_graph`]:
4040
//!
4141
//! ```
42-
//! use bitcoin::blockdata::constants::genesis_block;
42+
//! use bitcoin::constants::genesis_block;
4343
//! use bitcoin::Network;
4444
//! use lightning::routing::gossip::NetworkGraph;
4545
//! use lightning_rapid_gossip_sync::RapidGossipSync;

‎lightning-rapid-gossip-sync/src/processing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use core::cmp::max;
22
use core::ops::Deref;
33
use core::sync::atomic::Ordering;
44

5-
use bitcoin::blockdata::constants::ChainHash;
5+
use bitcoin::constants::ChainHash;
66
use bitcoin::secp256k1::PublicKey;
77

88
use lightning::io;

‎lightning-transaction-sync/tests/integration_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use lightning_transaction_sync::ElectrumSyncClient;
1212
use lightning_transaction_sync::EsploraSyncClient;
1313

1414
use bdk_macros::maybe_await;
15-
use bitcoin::blockdata::block::Header;
16-
use bitcoin::blockdata::constants::genesis_block;
15+
use bitcoin::block::Header;
16+
use bitcoin::constants::genesis_block;
1717
use bitcoin::network::Network;
1818
use bitcoin::{Amount, BlockHash, Txid};
1919
use bitcoind::bitcoincore_rpc::RpcApi;

‎lightning/src/chain/chaininterface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use core::{cmp, ops::Deref};
1717

1818
use crate::prelude::*;
1919

20-
use bitcoin::blockdata::transaction::Transaction;
20+
use bitcoin::transaction::Transaction;
2121

2222
// TODO: Define typed abstraction over feerates to handle their conversions.
2323
pub(crate) fn compute_feerate_sat_per_1000_weight(fee_sat: u64, weight: u64) -> u32 {

‎lightning/src/chain/chainmonitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//! events. The remote server would make use of [`ChainMonitor`] for block processing and for
2424
//! servicing [`ChannelMonitor`] updates from the client.
2525
26-
use bitcoin::blockdata::block::Header;
26+
use bitcoin::block::Header;
2727
use bitcoin::hash_types::{Txid, BlockHash};
2828

2929
use crate::chain;

‎lightning/src/chain/channelmonitor.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
//! ChannelMonitors to get out of the HSM and onto monitoring devices.
2222
2323
use bitcoin::amount::Amount;
24-
use bitcoin::blockdata::block::Header;
25-
use bitcoin::blockdata::transaction::{OutPoint as BitcoinOutPoint, TxOut, Transaction};
26-
use bitcoin::blockdata::script::{Script, ScriptBuf};
24+
use bitcoin::block::Header;
25+
use bitcoin::transaction::{OutPoint as BitcoinOutPoint, TxOut, Transaction};
26+
use bitcoin::script::{Script, ScriptBuf};
2727

2828
use bitcoin::hashes::Hash;
2929
use bitcoin::hashes::sha256::Hash as Sha256;
@@ -2533,7 +2533,7 @@ macro_rules! fail_unbroadcast_htlcs {
25332533

25342534
#[cfg(test)]
25352535
pub fn deliberately_bogus_accepted_htlc_witness_program() -> Vec<u8> {
2536-
use bitcoin::blockdata::opcodes;
2536+
use bitcoin::opcodes;
25372537
let mut ret = [opcodes::all::OP_NOP.to_u8(); 136];
25382538
ret[131] = opcodes::all::OP_DROP.to_u8();
25392539
ret[132] = opcodes::all::OP_DROP.to_u8();
@@ -4810,11 +4810,11 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
48104810
#[cfg(test)]
48114811
mod tests {
48124812
use bitcoin::amount::Amount;
4813-
use bitcoin::blockdata::locktime::absolute::LockTime;
4814-
use bitcoin::blockdata::script::{ScriptBuf, Builder};
4815-
use bitcoin::blockdata::opcodes;
4816-
use bitcoin::blockdata::transaction::{Transaction, TxIn, TxOut, Version};
4817-
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
4813+
use bitcoin::locktime::absolute::LockTime;
4814+
use bitcoin::script::{ScriptBuf, Builder};
4815+
use bitcoin::opcodes;
4816+
use bitcoin::transaction::{Transaction, TxIn, TxOut, Version};
4817+
use bitcoin::transaction::OutPoint as BitcoinOutPoint;
48184818
use bitcoin::sighash;
48194819
use bitcoin::sighash::EcdsaSighashType;
48204820
use bitcoin::hashes::Hash;

‎lightning/src/chain/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
//! Structs and traits which allow other parts of rust-lightning to interact with the blockchain.
1111
12-
use bitcoin::blockdata::block::{Block, Header};
13-
use bitcoin::blockdata::constants::genesis_block;
14-
use bitcoin::blockdata::script::{Script, ScriptBuf};
12+
use bitcoin::block::{Block, Header};
13+
use bitcoin::constants::genesis_block;
14+
use bitcoin::script::{Script, ScriptBuf};
1515
use bitcoin::hash_types::{BlockHash, Txid};
1616
use bitcoin::network::Network;
1717
use bitcoin::secp256k1::PublicKey;

‎lightning/src/chain/onchaintx.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
//! building, tracking, bumping and notifications functions.
1414
1515
use bitcoin::amount::Amount;
16-
use bitcoin::blockdata::locktime::absolute::LockTime;
17-
use bitcoin::blockdata::transaction::Transaction;
18-
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
19-
use bitcoin::blockdata::script::{Script, ScriptBuf};
16+
use bitcoin::locktime::absolute::LockTime;
17+
use bitcoin::transaction::Transaction;
18+
use bitcoin::transaction::OutPoint as BitcoinOutPoint;
19+
use bitcoin::script::{Script, ScriptBuf};
2020
use bitcoin::hashes::{Hash, HashEngine};
2121
use bitcoin::hashes::sha256::Hash as Sha256;
2222
use bitcoin::hash_types::{Txid, BlockHash};

‎lightning/src/chain/package.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
use bitcoin::{Sequence, Witness};
1616
use bitcoin::amount::Amount;
17-
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
18-
use bitcoin::blockdata::locktime::absolute::LockTime;
19-
use bitcoin::blockdata::transaction::{TxOut,TxIn, Transaction};
20-
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
21-
use bitcoin::blockdata::script::{Script, ScriptBuf};
17+
use bitcoin::constants::WITNESS_SCALE_FACTOR;
18+
use bitcoin::locktime::absolute::LockTime;
19+
use bitcoin::transaction::{TxOut,TxIn, Transaction};
20+
use bitcoin::transaction::OutPoint as BitcoinOutPoint;
21+
use bitcoin::script::{Script, ScriptBuf};
2222
use bitcoin::hash_types::Txid;
2323
use bitcoin::secp256k1::{SecretKey,PublicKey};
2424
use bitcoin::sighash::EcdsaSighashType;
@@ -1201,9 +1201,9 @@ mod tests {
12011201
use crate::ln::channel_keys::{DelayedPaymentBasepoint, HtlcBasepoint};
12021202

12031203
use bitcoin::amount::Amount;
1204-
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
1205-
use bitcoin::blockdata::script::ScriptBuf;
1206-
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
1204+
use bitcoin::constants::WITNESS_SCALE_FACTOR;
1205+
use bitcoin::script::ScriptBuf;
1206+
use bitcoin::transaction::OutPoint as BitcoinOutPoint;
12071207

12081208
use bitcoin::hashes::hex::FromHex;
12091209

‎lightning/src/chain/transaction.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//! Types describing on-chain transactions.
1111
1212
use bitcoin::hash_types::Txid;
13-
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
14-
use bitcoin::blockdata::transaction::Transaction;
13+
use bitcoin::transaction::OutPoint as BitcoinOutPoint;
14+
use bitcoin::transaction::Transaction;
1515

1616
/// Transaction data where each item consists of a transaction reference paired with the index of
1717
/// the transaction within a block.
@@ -23,8 +23,8 @@ use bitcoin::blockdata::transaction::Transaction;
2323
/// extern crate bitcoin;
2424
/// extern crate lightning;
2525
///
26-
/// use bitcoin::blockdata::block::Block;
27-
/// use bitcoin::blockdata::constants::genesis_block;
26+
/// use bitcoin::block::Block;
27+
/// use bitcoin::constants::genesis_block;
2828
/// use bitcoin::network::Network;
2929
/// use lightning::chain::transaction::TransactionData;
3030
///
@@ -45,7 +45,7 @@ pub type TransactionData<'a> = [(usize, &'a Transaction)];
4545

4646
/// A reference to a transaction output.
4747
///
48-
/// Differs from bitcoin::blockdata::transaction::OutPoint as the index is a u16 instead of u32
48+
/// Differs from bitcoin::transaction::OutPoint as the index is a u16 instead of u32
4949
/// due to LN's restrictions on index values. Should reduce (possibly) unsafe conversions this way.
5050
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
5151
pub struct OutPoint {
@@ -90,7 +90,7 @@ mod tests {
9090
use crate::chain::transaction::OutPoint;
9191
use crate::ln::types::ChannelId;
9292

93-
use bitcoin::blockdata::transaction::Transaction;
93+
use bitcoin::transaction::Transaction;
9494
use bitcoin::consensus::encode;
9595
use bitcoin::hashes::hex::FromHex;
9696

‎lightning/src/events/bump_transaction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ use crate::util::logger::Logger;
3434

3535
use bitcoin::{OutPoint, Psbt, PubkeyHash, Sequence, ScriptBuf, Transaction, TxIn, TxOut, Witness, WPubkeyHash};
3636
use bitcoin::amount::Amount;
37-
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
38-
use bitcoin::blockdata::locktime::absolute::LockTime;
37+
use bitcoin::constants::WITNESS_SCALE_FACTOR;
38+
use bitcoin::locktime::absolute::LockTime;
3939
use bitcoin::consensus::Encodable;
4040
use bitcoin::secp256k1;
4141
use bitcoin::secp256k1::{PublicKey, Secp256k1};

‎lightning/src/events/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ use crate::util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReada
3636
use crate::util::string::UntrustedString;
3737

3838
use bitcoin::{Transaction, OutPoint};
39-
use bitcoin::blockdata::locktime::absolute::LockTime;
40-
use bitcoin::blockdata::script::ScriptBuf;
39+
use bitcoin::locktime::absolute::LockTime;
40+
use bitcoin::script::ScriptBuf;
4141
use bitcoin::hashes::Hash;
4242
use bitcoin::hashes::sha256::Hash as Sha256;
4343
use bitcoin::secp256k1::PublicKey;

‎lightning/src/ln/async_signer_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use std::collections::HashSet;
1414

1515
use bitcoin::{Transaction, TxOut, TxIn, Amount};
16-
use bitcoin::blockdata::locktime::absolute::LockTime;
16+
use bitcoin::locktime::absolute::LockTime;
1717
use bitcoin::transaction::Version;
1818

1919
use crate::chain::channelmonitor::LATENCY_GRACE_PERIOD_BLOCKS;

‎lightning/src/ln/chan_utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
1313
use bitcoin::{PubkeyHash, WPubkeyHash};
1414
use bitcoin::amount::Amount;
15-
use bitcoin::blockdata::script::{Script, ScriptBuf, Builder};
16-
use bitcoin::blockdata::opcodes;
17-
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
15+
use bitcoin::script::{Script, ScriptBuf, Builder};
16+
use bitcoin::opcodes;
17+
use bitcoin::transaction::{TxIn,TxOut,OutPoint,Transaction};
1818
use bitcoin::sighash;
1919
use bitcoin::sighash::EcdsaSighashType;
2020
use bitcoin::transaction::Version;
@@ -33,7 +33,7 @@ use crate::ln::msgs::DecodeError;
3333
use crate::util::ser::{Readable, RequiredWrapper, Writeable, Writer};
3434
use crate::util::transaction_utils;
3535

36-
use bitcoin::blockdata::locktime::absolute::LockTime;
36+
use bitcoin::locktime::absolute::LockTime;
3737
use bitcoin::ecdsa::Signature as BitcoinSignature;
3838
use bitcoin::secp256k1::{SecretKey, PublicKey, Scalar};
3939
use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature, Message};

0 commit comments

Comments
 (0)