remove secp256k1 and bitcoin hashes dependencies

Author: serejkaaa512

Cargo.toml

@@ -12,8 +12,6 @@ readme = "README.md"
 
 [dependencies]
 bitcoin = { version= "0.23", features=["use-serde"]}
-bitcoin_hashes={version="0.7", features=["serde"]}
-secp256k1 = "0.17"
 rand="0.7"
 rust-crypto = "0.2"
 serde = "1"

src/account.rs

@@ -18,6 +18,7 @@
 //!
 //! Accounts compatible with BIP32, BIP39, BIP44, BIP49, BIP84
 //!
+use bitcoin::hashes::{hash160, Hash};
 use bitcoin::util::bip32::ExtendedPubKey;
 use bitcoin::{
     blockdata::script::Builder,
@@ -30,7 +31,6 @@ use bitcoin::{
     util::bip32::{ChildNumber, ExtendedPrivKey},
     Address, OutPoint, PrivateKey, PublicKey, Script, Transaction,
 };
-use bitcoin_hashes::{hash160, Hash};
 use crypto::{
     aes, blockmodes, buffer,
     buffer::{BufferResult, ReadBuffer, WriteBuffer},

src/context.rs

@@ -16,12 +16,12 @@
 //!
 //! # Key derivation
 //!
+use bitcoin::secp256k1::{All, Message, Secp256k1, Signature};
 use bitcoin::{
     network::constants::Network,
     util::bip32::{ChildNumber, ExtendedPrivKey, ExtendedPubKey},
     PrivateKey, PublicKey,
 };
-use secp256k1::{All, Message, Secp256k1, Signature};
 
 use account::Seed;
 use error::Error;

src/error.rs

@@ -39,7 +39,7 @@ pub enum Error {
     /// key derivation error
     KeyDerivation(bip32::Error),
     /// sekp256k1 error
-    SecpError(secp256k1::Error),
+    SecpError(bitcoin::secp256k1::Error),
     /// cipher error
     SymmetricCipherError(symmetriccipher::SymmetricCipherError),
 }
@@ -135,8 +135,8 @@ impl convert::From<symmetriccipher::SymmetricCipherError> for Error {
     }
 }
 
-impl convert::From<secp256k1::Error> for Error {
-    fn from(err: secp256k1::Error) -> Error {
+impl convert::From<bitcoin::secp256k1::Error> for Error {
+    fn from(err: bitcoin::secp256k1::Error) -> Error {
         Error::SecpError(err)
     }
 }

src/lib.rs

@@ -22,12 +22,10 @@
 #![forbid(unsafe_code)]
 
 extern crate bitcoin;
-extern crate bitcoin_hashes;
 extern crate crypto;
 #[cfg(test)]
 extern crate hex;
 extern crate rand;
-extern crate secp256k1;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;

src/proved.rs

@@ -18,8 +18,8 @@
 //!
 //!
 
+use bitcoin::hashes::{sha256d, Hash, HashEngine};
 use bitcoin::{BitcoinHash, Block, Transaction};
-use bitcoin_hashes::{sha256d, Hash, HashEngine};
 
 /// A confirmed transaction with its SPV proof
 #[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]