Replace hashing and secp256k1 dependencies with components of the bitcoin crate.

Author: arik-so

fuzz/src/full_stack.rs

@@ -1,5 +1,5 @@
-use bitcoin_hashes::{Hash, HashEngine};
-use bitcoin_hashes::sha256::Hash as Sha256;
+use bitcoin::hashes::{Hash, HashEngine};
+use bitcoin::hashes::sha256::Hash as Sha256;
 
 pub(crate) struct HandshakeHash {
 	pub(super) value: [u8; 32]
@@ -22,4 +22,4 @@ impl HandshakeHash {
 		sha.input(input);
 		self.value = Sha256::from_engine(sha).into_inner();
 	}
-}
+}

lightning/src/ln/peers/handshake/hash.rs

@@ -2,11 +2,11 @@
 //! Handshake states can be advanced automatically, or by manually calling the appropriate step.
 //! Once complete, returns an instance of Conduit.
 
-use secp256k1;
+use bitcoin::secp256k1;
 
-use bitcoin_hashes::{Hash, HashEngine};
-use bitcoin_hashes::sha256::Hash as Sha256;
-use secp256k1::{PublicKey, SecretKey};
+use bitcoin::hashes::{Hash, HashEngine};
+use bitcoin::hashes::sha256::Hash as Sha256;
+use bitcoin::secp256k1::{PublicKey, SecretKey};
 
 use ln::peers::{chacha, hkdf};
 use ln::peers::conduit::{Conduit, SymmetricKey};
@@ -391,4 +391,4 @@ impl PeerHandshake {
 		sha.input(preimage.as_ref());
 		Sha256::from_engine(sha).into_inner()
 	}
-}
+}

lightning/src/ln/peers/handshake/mod.rs

@@ -1,5 +1,5 @@
 use ln::peers::handshake::hash::HandshakeHash;
-use secp256k1::{SecretKey, PublicKey};
+use bitcoin::secp256k1::{SecretKey, PublicKey};
 
 pub enum HandshakeState {
 	Uninitiated,
@@ -27,4 +27,4 @@ pub struct ActThreeExpectation {
 	pub(super) temporary_key: [u8; 32],
 	pub(super) ephemeral_private_key: SecretKey,
 	pub(super) remote_ephemeral_public_key: PublicKey,
-}
+}

lightning/src/ln/peers/handshake/states.rs

@@ -1,9 +1,9 @@
 #![cfg(test)]
 
 use hex;
-use secp256k1;
+use bitcoin::secp256k1;
 
-use secp256k1::key::{PublicKey, SecretKey};
+use bitcoin::secp256k1::key::{PublicKey, SecretKey};
 
 use ln::peers::handshake::PeerHandshake;
 
@@ -36,4 +36,4 @@ fn test_exchange() {
 	assert_eq!(act_3_hex, "00b9e3a702e93e3a9948c2ed6e5fd7590a6e1c3a0344cfc9d5b57357049aa22355361aa02e55a8fc28fef5bd6d71ad0c38228dc68b1c466263b47fdf31e560e139ba");
 
 	remote_handshake.process_act_three(act_3).unwrap();
-}
+}

lightning/src/ln/peers/handshake/tests.rs

@@ -1,5 +1,5 @@
-use bitcoin_hashes::{Hash, HashEngine, Hmac, HmacEngine};
-use bitcoin_hashes::sha256::Hash as Sha256;
+use bitcoin::hashes::{Hash, HashEngine, Hmac, HmacEngine};
+use bitcoin::hashes::sha256::Hash as Sha256;
 
 pub fn derive(salt: &[u8], master: &[u8]) -> ([u8; 32], [u8; 32]) {
 	let mut hmac = HmacEngine::<Sha256>::new(salt);
@@ -15,4 +15,4 @@ pub fn derive(salt: &[u8], master: &[u8]) -> ([u8; 32], [u8; 32]) {
 	hmac.input(&[2; 1]);
 	// sha256(prk | t1 | 2) = sha256(sha256(master) | sha256(sha256(sha256(master) | 1) | 2)
 	(t1, Hmac::from_engine(hmac).into_inner())
-}
+}