Consolidate dependencies (#40)

Author: raphjaph

Cargo-minimal.lock

@@ -36,8 +36,6 @@ version = "0.0.7"
 dependencies = [
  "base64",
  "bitcoin",
- "bitcoin-io",
- "bitcoin_hashes",
  "hex",
  "miniscript",
  "pretty_assertions",

Cargo-recent.lock

@@ -36,8 +36,6 @@ version = "0.0.7"
 dependencies = [
  "base64",
  "bitcoin",
- "bitcoin-io",
- "bitcoin_hashes",
  "hex",
  "miniscript",
  "pretty_assertions",

Cargo.lock

@@ -14,8 +14,6 @@ default = []
 [dependencies]
 base64 = "0.22.1"
 bitcoin = "0.32.3" 
-bitcoin-io = "0.1.2"
-bitcoin_hashes = "0.14.0"
 hex = "0.4.3"
 miniscript = "12.2.0"
 snafu = { version =  "0.8.5", default-features = false, features = ["rust_1_61", "std"] }

Cargo.toml

@@ -18,7 +18,7 @@ pub enum Error {
     signature: String,
   },
   #[snafu(display("Transaction encode error"))]
-  TransactionEncode { source: bitcoin_io::Error },
+  TransactionEncode { source: bitcoin::io::Error },
   #[snafu(display("Transaction extract error"))]
   TransactionExtract {
     source: bitcoin::psbt::ExtractTxError,
@@ -44,7 +44,7 @@ pub enum Error {
   #[snafu(display("Witness empty"))]
   WitnessEmpty,
   #[snafu(display("Encode witness error"))]
-  WitnessEncoding { source: bitcoin_io::Error },
+  WitnessEncoding { source: bitcoin::io::Error },
   #[snafu(display("Signature of wrong length `{length}`"))]
   SignatureLength {
     length: usize,

src/error.rs

@@ -1,5 +1,6 @@
 use {
   base64::{engine::general_purpose, Engine},
+  bitcoin::hashes::{sha256, Hash},
   bitcoin::{
     absolute::LockTime,
     address::AddressData,
@@ -16,7 +17,6 @@ use {
     Address, Amount, EcdsaSighashType, OutPoint, PrivateKey, PublicKey, ScriptBuf, Sequence,
     Transaction, TxIn, TxOut, Witness,
   },
-  bitcoin_hashes::{sha256, Hash},
   error::Error,
   snafu::{ResultExt, Snafu},
   std::str::FromStr,

src/lib.rs

@@ -6,7 +6,7 @@ pub fn verify_simple_encoded(address: &str, message: &str, signature: &str) -> R
     .context(error::AddressParse { address })?
     .assume_checked();
 
-  let mut cursor = bitcoin_io::Cursor::new(
+  let mut cursor = bitcoin::io::Cursor::new(
     general_purpose::STANDARD
       .decode(signature)
       .context(error::SignatureDecode { signature })?,
@@ -24,7 +24,7 @@ pub fn verify_full_encoded(address: &str, message: &str, to_sign: &str) -> Resul
     .context(error::AddressParse { address })?
     .assume_checked();
 
-  let mut cursor = bitcoin_io::Cursor::new(general_purpose::STANDARD.decode(to_sign).context(
+  let mut cursor = bitcoin::io::Cursor::new(general_purpose::STANDARD.decode(to_sign).context(
     error::TransactionBase64Decode {
       transaction: to_sign,
     },