Skip to content

Commit 00ba739

Browse files
elichaielichai
committed
Replaced bitcoin_hashes with bitcoin::hashes
1 parent 6ebdef0 commit 00ba739

25 files changed

+74
-80
lines changed

‎Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Still missing tons of error-handling. See GitHub issues for suggested projects i
1313
[features]
1414
# Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks.
1515
non_bitcoin_chain_hash_routing = []
16-
fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget", "bitcoin_hashes/fuzztarget"]
16+
fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget"]
1717
# Unlog messages superior at targeted level.
1818
max_level_off = []
1919
max_level_error = []
@@ -23,7 +23,6 @@ max_level_debug = []
2323

2424
[dependencies]
2525
bitcoin = "0.20"
26-
bitcoin_hashes = "0.3"
2726
secp256k1 = "0.15"
2827

2928
[dev-dependencies.bitcoin]

‎fuzz/fuzz_targets/chanmon_deser_target.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
33

44
extern crate bitcoin;
5-
extern crate bitcoin_hashes;
65
extern crate lightning;
76

8-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
7+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
98

109
use lightning::ln::channelmonitor;
1110
use lightning::util::ser::{ReadableArgs, Writer};

‎fuzz/fuzz_targets/chanmon_fail_consistency.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
//#![no_main]
1414

1515
extern crate bitcoin;
16-
extern crate bitcoin_hashes;
1716
extern crate lightning;
1817
extern crate secp256k1;
1918

@@ -24,10 +23,10 @@ use bitcoin::blockdata::script::{Builder, Script};
2423
use bitcoin::blockdata::opcodes;
2524
use bitcoin::network::constants::Network;
2625

27-
use bitcoin_hashes::Hash as TraitImport;
28-
use bitcoin_hashes::hash160::Hash as Hash160;
29-
use bitcoin_hashes::sha256::Hash as Sha256;
30-
use bitcoin_hashes::sha256d::Hash as Sha256d;
26+
use bitcoin::hashes::Hash as TraitImport;
27+
use bitcoin::hashes::hash160::Hash as Hash160;
28+
use bitcoin::hashes::sha256::Hash as Sha256;
29+
use bitcoin::hashes::sha256d::Hash as Sha256d;
3130

3231
use lightning::chain::chaininterface;
3332
use lightning::chain::transaction::OutPoint;

‎fuzz/fuzz_targets/full_stack_target.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
//#![no_main]
99

1010
extern crate bitcoin;
11-
extern crate bitcoin_hashes;
1211
extern crate lightning;
1312
extern crate secp256k1;
1413

@@ -20,11 +19,11 @@ use bitcoin::consensus::encode::deserialize;
2019
use bitcoin::network::constants::Network;
2120
use bitcoin::util::hash::BitcoinHash;
2221

23-
use bitcoin_hashes::Hash as TraitImport;
24-
use bitcoin_hashes::HashEngine as TraitImportEngine;
25-
use bitcoin_hashes::sha256::Hash as Sha256;
26-
use bitcoin_hashes::hash160::Hash as Hash160;
27-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
22+
use bitcoin::hashes::Hash as TraitImport;
23+
use bitcoin::hashes::HashEngine as TraitImportEngine;
24+
use bitcoin::hashes::sha256::Hash as Sha256;
25+
use bitcoin::hashes::hash160::Hash as Hash160;
26+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
2827

2928
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
3029
use lightning::chain::transaction::OutPoint;

‎fuzz/fuzz_targets/router_target.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
extern crate bitcoin;
2-
extern crate bitcoin_hashes;
32
extern crate lightning;
43
extern crate secp256k1;
54

6-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
5+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
76
use bitcoin::blockdata::script::{Script, Builder};
87

98
use lightning::chain::chaininterface::{ChainError,ChainWatchInterface, ChainListener};

‎src/chain/chaininterface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use bitcoin::blockdata::transaction::Transaction;
99
use bitcoin::blockdata::script::Script;
1010
use bitcoin::blockdata::constants::genesis_block;
1111
use bitcoin::util::hash::BitcoinHash;
12-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
12+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1313
use bitcoin::network::constants::Network;
1414

1515
use util::logger::Logger;

‎src/chain/keysinterface.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ use bitcoin::blockdata::opcodes;
88
use bitcoin::network::constants::Network;
99
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
1010

11-
use bitcoin_hashes::{Hash, HashEngine};
12-
use bitcoin_hashes::sha256::HashEngine as Sha256State;
13-
use bitcoin_hashes::sha256::Hash as Sha256;
14-
use bitcoin_hashes::hash160::Hash as Hash160;
11+
use bitcoin::hashes::{Hash, HashEngine};
12+
use bitcoin::hashes::sha256::HashEngine as Sha256State;
13+
use bitcoin::hashes::sha256::Hash as Sha256;
14+
use bitcoin::hashes::hash160::Hash as Hash160;
1515

1616
use secp256k1::key::{SecretKey, PublicKey};
1717
use secp256k1::Secp256k1;

‎src/chain/transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Contains simple structs describing parts of transactions on the chain.
22
3-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
3+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
44
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
55

66
/// A reference to a transaction output.

‎src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#![forbid(unsafe_code)]
1414

1515
extern crate bitcoin;
16-
extern crate bitcoin_hashes;
1716
extern crate secp256k1;
1817
#[cfg(test)] extern crate rand;
1918
#[cfg(test)] extern crate hex;

‎src/ln/chan_utils.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use bitcoin::blockdata::script::{Script,Builder};
22
use bitcoin::blockdata::opcodes;
33
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
44

5-
use bitcoin_hashes::{Hash, HashEngine};
6-
use bitcoin_hashes::sha256::Hash as Sha256;
7-
use bitcoin_hashes::ripemd160::Hash as Ripemd160;
8-
use bitcoin_hashes::hash160::Hash as Hash160;
9-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
5+
use bitcoin::hashes::{Hash, HashEngine};
6+
use bitcoin::hashes::sha256::Hash as Sha256;
7+
use bitcoin::hashes::ripemd160::Hash as Ripemd160;
8+
use bitcoin::hashes::hash160::Hash as Hash160;
9+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1010

1111
use ln::channelmanager::PaymentHash;
1212

‎src/ln/chanmon_update_fail_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use ln::msgs::{ChannelMessageHandler, LocalFeatures, RoutingMessageHandler};
1010
use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
1111
use util::errors::APIError;
1212

13-
use bitcoin_hashes::sha256::Hash as Sha256;
14-
use bitcoin_hashes::Hash;
13+
use bitcoin::hashes::sha256::Hash as Sha256;
14+
use bitcoin::hashes::Hash;
1515

1616
use ln::functional_test_utils::*;
1717

‎src/ln/channel.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use bitcoin::util::hash::BitcoinHash;
66
use bitcoin::util::bip143;
77
use bitcoin::consensus::encode::{self, Encodable, Decodable};
88

9-
use bitcoin_hashes::{Hash, HashEngine};
10-
use bitcoin_hashes::sha256::Hash as Sha256;
11-
use bitcoin_hashes::hash160::Hash as Hash160;
12-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
9+
use bitcoin::hashes::{Hash, HashEngine};
10+
use bitcoin::hashes::sha256::Hash as Sha256;
11+
use bitcoin::hashes::hash160::Hash as Hash160;
12+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1313

1414
use secp256k1::key::{PublicKey,SecretKey};
1515
use secp256k1::{Secp256k1,Signature};
@@ -4103,7 +4103,7 @@ mod tests {
41034103
use bitcoin::blockdata::script::{Script, Builder};
41044104
use bitcoin::blockdata::transaction::Transaction;
41054105
use bitcoin::blockdata::opcodes;
4106-
use bitcoin_hashes::hex::FromHex;
4106+
use bitcoin::hashes::hex::FromHex;
41074107
use hex;
41084108
use ln::channelmanager::{HTLCSource, PaymentPreimage, PaymentHash};
41094109
use ln::channel::{Channel,ChannelKeys,InboundHTLCOutput,OutboundHTLCOutput,InboundHTLCState,OutboundHTLCState,HTLCOutputInCommitment,TxCreationKeys};
@@ -4117,10 +4117,10 @@ mod tests {
41174117
use util::logger::Logger;
41184118
use secp256k1::{Secp256k1,Message,Signature};
41194119
use secp256k1::key::{SecretKey,PublicKey};
4120-
use bitcoin_hashes::sha256::Hash as Sha256;
4121-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
4122-
use bitcoin_hashes::hash160::Hash as Hash160;
4123-
use bitcoin_hashes::Hash;
4120+
use bitcoin::hashes::sha256::Hash as Sha256;
4121+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
4122+
use bitcoin::hashes::hash160::Hash as Hash160;
4123+
use bitcoin::hashes::Hash;
41244124
use std::sync::Arc;
41254125

41264126
struct TestFeeEstimator {

‎src/ln/channelmanager.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ use bitcoin::blockdata::constants::genesis_block;
1414
use bitcoin::network::constants::Network;
1515
use bitcoin::util::hash::BitcoinHash;
1616

17-
use bitcoin_hashes::{Hash, HashEngine};
18-
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
19-
use bitcoin_hashes::sha256::Hash as Sha256;
20-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
21-
use bitcoin_hashes::cmp::fixed_time_eq;
17+
use bitcoin::hashes::{Hash, HashEngine};
18+
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
19+
use bitcoin::hashes::sha256::Hash as Sha256;
20+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
21+
use bitcoin::hashes::cmp::fixed_time_eq;
2222

2323
use secp256k1::key::{SecretKey,PublicKey};
2424
use secp256k1::Secp256k1;

‎src/ln/channelmonitor.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ use bitcoin::consensus::encode::{self, Decodable, Encodable};
2020
use bitcoin::util::hash::BitcoinHash;
2121
use bitcoin::util::bip143;
2222

23-
use bitcoin_hashes::Hash;
24-
use bitcoin_hashes::sha256::Hash as Sha256;
25-
use bitcoin_hashes::hash160::Hash as Hash160;
26-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
23+
use bitcoin::hashes::Hash;
24+
use bitcoin::hashes::sha256::Hash as Sha256;
25+
use bitcoin::hashes::hash160::Hash as Hash160;
26+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
2727

2828
use secp256k1::{Secp256k1,Signature};
2929
use secp256k1::key::{SecretKey,PublicKey};
@@ -2815,10 +2815,10 @@ mod tests {
28152815
use bitcoin::blockdata::transaction::{Transaction, TxIn, TxOut, SigHashType};
28162816
use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
28172817
use bitcoin::util::bip143;
2818-
use bitcoin_hashes::Hash;
2819-
use bitcoin_hashes::sha256::Hash as Sha256;
2820-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
2821-
use bitcoin_hashes::hex::FromHex;
2818+
use bitcoin::hashes::Hash;
2819+
use bitcoin::hashes::sha256::Hash as Sha256;
2820+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
2821+
use bitcoin::hashes::hex::FromHex;
28222822
use hex;
28232823
use ln::channelmanager::{PaymentPreimage, PaymentHash};
28242824
use ln::channelmonitor::{ChannelMonitor, InputDescriptors};

‎src/ln/functional_test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ use bitcoin::blockdata::block::BlockHeader;
1919
use bitcoin::blockdata::transaction::{Transaction, TxOut};
2020
use bitcoin::network::constants::Network;
2121

22-
use bitcoin_hashes::sha256::Hash as Sha256;
23-
use bitcoin_hashes::sha256d::Hash as Sha256d;
24-
use bitcoin_hashes::Hash;
22+
use bitcoin::hashes::sha256::Hash as Sha256;
23+
use bitcoin::hashes::sha256d::Hash as Sha256d;
24+
use bitcoin::hashes::Hash;
2525

2626
use secp256k1::Secp256k1;
2727
use secp256k1::key::PublicKey;

‎src/ln/functional_tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use util::config::UserConfig;
2222
use util::logger::Logger;
2323

2424
use bitcoin::util::hash::BitcoinHash;
25-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
25+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
2626
use bitcoin::util::bip143;
2727
use bitcoin::util::address::Address;
2828
use bitcoin::util::bip32::{ChildNumber, ExtendedPubKey, ExtendedPrivKey};
@@ -33,8 +33,8 @@ use bitcoin::blockdata::opcodes;
3333
use bitcoin::blockdata::constants::genesis_block;
3434
use bitcoin::network::constants::Network;
3535

36-
use bitcoin_hashes::sha256::Hash as Sha256;
37-
use bitcoin_hashes::Hash;
36+
use bitcoin::hashes::sha256::Hash as Sha256;
37+
use bitcoin::hashes::Hash;
3838

3939
use secp256k1::{Secp256k1, Message};
4040
use secp256k1::key::{PublicKey,SecretKey};

‎src/ln/msgs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use secp256k1::key::PublicKey;
1919
use secp256k1::Signature;
2020
use secp256k1;
21-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
21+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
2222
use bitcoin::blockdata::script::Script;
2323

2424
use std::error::Error;
@@ -1390,8 +1390,8 @@ mod tests {
13901390
use ln::channelmanager::{PaymentPreimage, PaymentHash};
13911391
use util::ser::Writeable;
13921392

1393-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
1394-
use bitcoin_hashes::hex::FromHex;
1393+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1394+
use bitcoin::hashes::hex::FromHex;
13951395
use bitcoin::util::address::Address;
13961396
use bitcoin::network::constants::Network;
13971397
use bitcoin::blockdata::script::Builder;

‎src/ln/onion_utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use util::errors::{self, APIError};
77
use util::ser::{Readable, Writeable};
88
use util::logger::{Logger, LogHolder};
99

10-
use bitcoin_hashes::{Hash, HashEngine};
11-
use bitcoin_hashes::cmp::fixed_time_eq;
12-
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
13-
use bitcoin_hashes::sha256::Hash as Sha256;
10+
use bitcoin::hashes::{Hash, HashEngine};
11+
use bitcoin::hashes::cmp::fixed_time_eq;
12+
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
13+
use bitcoin::hashes::sha256::Hash as Sha256;
1414

1515
use secp256k1::key::{SecretKey,PublicKey};
1616
use secp256k1::Secp256k1;

‎src/ln/peer_channel_encryptor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use ln::msgs::HandleError;
22
use ln::msgs;
33

4-
use bitcoin_hashes::{Hash, HashEngine, Hmac, HmacEngine};
5-
use bitcoin_hashes::sha256::Hash as Sha256;
4+
use bitcoin::hashes::{Hash, HashEngine, Hmac, HmacEngine};
5+
use bitcoin::hashes::sha256::Hash as Sha256;
66

77
use secp256k1::Secp256k1;
88
use secp256k1::key::{PublicKey,SecretKey};

‎src/ln/peer_handler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ use std::sync::{Arc, Mutex};
2020
use std::sync::atomic::{AtomicUsize, Ordering};
2121
use std::{cmp,error,hash,fmt};
2222

23-
use bitcoin_hashes::sha256::Hash as Sha256;
24-
use bitcoin_hashes::sha256::HashEngine as Sha256Engine;
25-
use bitcoin_hashes::{HashEngine, Hash};
23+
use bitcoin::hashes::sha256::Hash as Sha256;
24+
use bitcoin::hashes::sha256::HashEngine as Sha256Engine;
25+
use bitcoin::hashes::{HashEngine, Hash};
2626

2727
/// Provides references to trait impls which handle different types of messages.
2828
pub struct MessageHandler {

‎src/ln/router.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use secp256k1::key::PublicKey;
77
use secp256k1::Secp256k1;
88
use secp256k1;
99

10-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
11-
use bitcoin_hashes::Hash;
10+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
11+
use bitcoin::hashes::Hash;
1212
use bitcoin::blockdata::script::Builder;
1313
use bitcoin::blockdata::opcodes;
1414

@@ -1021,8 +1021,8 @@ mod tests {
10211021
use util::logger::Logger;
10221022
use util::ser::{Writeable, Readable};
10231023

1024-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
1025-
use bitcoin_hashes::Hash;
1024+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1025+
use bitcoin::hashes::Hash;
10261026
use bitcoin::network::constants::Network;
10271027

10281028
use hex;

‎src/util/chacha20poly1305rfc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
mod real_chachapoly {
1515
use util::chacha20::ChaCha20;
1616
use util::poly1305::Poly1305;
17-
use bitcoin_hashes::cmp::fixed_time_eq;
17+
use bitcoin::hashes::cmp::fixed_time_eq;
1818

1919
use util::byte_utils;
2020

‎src/util/macro_logger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use chain::transaction::OutPoint;
22

3-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
3+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
44
use secp256k1::key::PublicKey;
55

66
use ln::router::Route;

‎src/util/ser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use secp256k1::Signature;
1010
use secp256k1::key::{PublicKey, SecretKey};
1111
use bitcoin::blockdata::script::Script;
1212
use bitcoin::blockdata::transaction::OutPoint;
13-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
13+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1414
use std::marker::Sized;
1515
use ln::msgs::DecodeError;
1616
use ln::channelmanager::{PaymentPreimage, PaymentHash};
@@ -349,7 +349,7 @@ impl Writeable for Sha256dHash {
349349

350350
impl<R: Read> Readable<R> for Sha256dHash {
351351
fn read(r: &mut R) -> Result<Self, DecodeError> {
352-
use bitcoin_hashes::Hash;
352+
use bitcoin::hashes::Hash;
353353

354354
let buf: [u8; 32] = Readable::read(r)?;
355355
Ok(Sha256dHash::from_slice(&buf[..]).unwrap())

‎src/util/test_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use util::ser::{ReadableArgs, Writer};
1313

1414
use bitcoin::blockdata::transaction::Transaction;
1515
use bitcoin::blockdata::script::Script;
16-
use bitcoin_hashes::sha256d::Hash as Sha256dHash;
16+
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
1717
use bitcoin::network::constants::Network;
1818

1919
use secp256k1::{SecretKey, PublicKey};

0 commit comments

Comments
 (0)