Remove base64 dependency

We don't need base64 because rust-bitcoin already exposes a version of
that crate that we can use. Removing one more parallel dependency.

diff --git a/Cargo.lock b/Cargo.lock
index 23157ba54b9082f1237596bd1174bb367eea08b7..49c1c251e5d6b96fece63b0de7d9ae4ad0837b06 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,7 +137,6 @@ dependencies = [
 name = "bdk-cli"
 version = "0.5.0"
 dependencies = [
- "base64 0.11.0",
  "bdk",
  "bdk-macros",
  "bdk-reserves",

diff --git a/Cargo.toml b/Cargo.toml
index f0a6c1efba2e46340b6b39914cd9bfdbbaec8b99..b613e6c113a6994cf5a14dc9ec567e70a4771b72 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,6 @@ bdk-macros = "0.6"
 structopt = "0.3"
 serde_json = "1.0"
 log = "0.4"
-base64 = "0.11"
 zeroize = "<1.4.0"
 dirs-next = "2.0"
 env_logger = "0.7"

diff --git a/src/commands.rs b/src/commands.rs
index 015c3fd0a1383375a56b21ddf1a214eda7159525..d64ff371c5c98981f51d51816c03361dd1c0ef8f 100644 (file)
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -1388,7 +1388,7 @@ mod test {
     fn encode_psbt(psbt: PartiallySignedTransaction) -> Vec<u8> {
         let mut encoded = Vec::<u8>::new();
         psbt.consensus_encode(&mut encoded).unwrap();
-        let base64_psbt = base64::encode(&encoded);
+        let base64_psbt = bdk::bitcoin::base64::encode(&encoded);
 
         base64_psbt.as_bytes().to_vec()
     }

diff --git a/src/handlers.rs b/src/handlers.rs
index 445299778a9fdbd2f334f9500de9de9bde70ae28..db69b04364c89329139eb51ff5336fec25302479 100644 (file)
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -27,6 +27,7 @@ use bdk::{database::BatchDatabase, wallet::AddressIndex, Error, FeeRate, Keychai
 
 use structopt::StructOpt;
 
+use bdk::bitcoin::base64;
 use bdk::bitcoin::consensus::encode::{deserialize, serialize, serialize_hex};
 #[cfg(any(
     feature = "electrum",
@@ -503,7 +504,7 @@ pub fn handle_ext_reserves_subcommand(
     let outpoints_per_addr = addresses
         .iter()
         .map(|address| {
-            let address = Address::from_str(&address)
+            let address = Address::from_str(address)
                 .map_err(|e| Error::Generic(format!("Invalid address: {:?}", e)))?;
             get_outpoints_for_address(address, &client, max_confirmation_height)
         })

diff --git a/src/utils.rs b/src/utils.rs
index 8e4251a2014163c26f5ed13fb2a0b8abda6a87be..46815b48fd3c1d0cc2ba7b63ac602dc2509a9940 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -282,7 +282,7 @@ pub(crate) fn new_blockchain(
             &Secp256k1::new(),
         )?;
 
-        let rpc_url = "http://".to_string() + &url;
+        let rpc_url = "http://".to_string() + url;
 
         let rpc_config = RpcConfig {
             url: rpc_url,
@@ -295,7 +295,7 @@ pub(crate) fn new_blockchain(
         AnyBlockchainConfig::Rpc(rpc_config)
     };
 
-    Ok(AnyBlockchain::from_config(&config)?)
+    AnyBlockchain::from_config(&config)
 }
 
 /// Create a new wallet from given wallet configuration options