chore: remove anyhow dev dependency from electrum, esplora, and…

… `bitcoind_rpc`
LagginTimes · May 3, 2024 · 0bf05b7 · 0bf05b7
1 parent fbe1782
commit 0bf05b7
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/crates/bitcoind_rpc/Cargo.toml b/crates/bitcoind_rpc/Cargo.toml
@@ -20,7 +20,6 @@ bdk_chain = { path = "../chain", version = "0.13", default-features = false }
 
 [dev-dependencies]
 bdk_testenv = { path = "../testenv", default_features = false }
-anyhow = { version = "1" }
 
 [features]
 default = ["std"]

diff --git a/crates/bitcoind_rpc/tests/test_emitter.rs b/crates/bitcoind_rpc/tests/test_emitter.rs
@@ -7,7 +7,7 @@ use bdk_chain::{
     local_chain::{CheckPoint, LocalChain},
     Append, BlockId, IndexedTxGraph, SpkTxOutIndex,
 };
-use bdk_testenv::TestEnv;
+use bdk_testenv::{electrsd::bitcoind::anyhow, TestEnv};
 use bitcoin::{hashes::Hash, Block, OutPoint, ScriptBuf, WScriptHash};
 use bitcoincore_rpc::RpcApi;
 

diff --git a/crates/electrum/Cargo.toml b/crates/electrum/Cargo.toml
@@ -17,6 +17,4 @@ electrum-client = { version = "0.19" }
 #rustls = { version = "=0.21.1", optional = true, features = ["dangerous_configuration"] }
 
 [dev-dependencies]
-bdk_testenv = { path = "../testenv", default-features = false }
-electrsd = { version= "0.27.1", features = ["bitcoind_25_0", "esplora_a33e97e1", "legacy"] }
-anyhow = "1"
+bdk_testenv = { path = "../testenv", default-features = false }
diff --git a/crates/electrum/tests/test_electrum.rs b/crates/electrum/tests/test_electrum.rs
@@ -1,13 +1,14 @@
-use anyhow::Result;
 use bdk_chain::{
     bitcoin::{hashes::Hash, Address, Amount, ScriptBuf, WScriptHash},
     keychain::Balance,
     local_chain::LocalChain,
     ConfirmationTimeHeightAnchor, IndexedTxGraph, SpkTxOutIndex,
 };
 use bdk_electrum::{ElectrumExt, ElectrumUpdate};
-use bdk_testenv::TestEnv;
-use electrsd::bitcoind::bitcoincore_rpc::RpcApi;
+use bdk_testenv::{
+    electrsd::bitcoind::{anyhow, anyhow::Result, bitcoincore_rpc::RpcApi},
+    TestEnv,
+};
 
 fn get_balance(
     recv_chain: &LocalChain,

diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml
@@ -25,7 +25,6 @@ miniscript = { version = "11.0.0", optional = true, default-features = false }
 bdk_testenv = { path = "../testenv", default_features = false }
 electrsd = { version= "0.27.1", features = ["bitcoind_25_0", "esplora_a33e97e1", "legacy"] }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
-anyhow = "1"
 
 [features]
 default = ["std", "async-https", "blocking-https-rustls"]

diff --git a/crates/esplora/src/async_ext.rs b/crates/esplora/src/async_ext.rs
@@ -417,8 +417,10 @@ mod test {
         local_chain::LocalChain,
         BlockId,
     };
-    use bdk_testenv::TestEnv;
-    use electrsd::bitcoind::bitcoincore_rpc::RpcApi;
+    use bdk_testenv::{
+        electrsd::bitcoind::{anyhow::Result, bitcoincore_rpc::RpcApi},
+        TestEnv,
+    };
     use esplora_client::Builder;
 
     use crate::async_ext::{chain_update, fetch_latest_blocks};
@@ -431,7 +433,7 @@ mod test {
 
     /// Ensure that update does not remove heights (from original), and all anchor heights are included.
     #[tokio::test]
-    pub async fn test_finalize_chain_update() -> anyhow::Result<()> {
+    pub async fn test_finalize_chain_update() -> Result<()> {
         struct TestCase<'a> {
             name: &'a str,
             /// Initial blockchain height to start the env with.
@@ -494,7 +496,7 @@ mod test {
                 let anchors = t
                     .initial_cps
                     .iter()
-                    .map(|&height| -> anyhow::Result<_> {
+                    .map(|&height| -> Result<_> {
                         Ok((
                             BlockId {
                                 height,
@@ -503,7 +505,7 @@ mod test {
                             Txid::all_zeros(),
                         ))
                     })
-                    .collect::<anyhow::Result<BTreeSet<_>>>()?;
+                    .collect::<Result<BTreeSet<_>>>()?;
                 let update = chain_update(
                     &client,
                     &fetch_latest_blocks(&client).await?,
@@ -532,7 +534,7 @@ mod test {
                 let anchors = t
                     .anchors
                     .iter()
-                    .map(|&(height, txid)| -> anyhow::Result<_> {
+                    .map(|&(height, txid)| -> Result<_> {
                         Ok((
                             BlockId {
                                 height,
@@ -541,7 +543,7 @@ mod test {
                             txid,
                         ))
                     })
-                    .collect::<anyhow::Result<_>>()?;
+                    .collect::<Result<_>>()?;
                 chain_update(
                     &client,
                     &fetch_latest_blocks(&client).await?,

diff --git a/crates/esplora/src/blocking_ext.rs b/crates/esplora/src/blocking_ext.rs
@@ -407,8 +407,10 @@ mod test {
     use bdk_chain::bitcoin::Txid;
     use bdk_chain::local_chain::LocalChain;
     use bdk_chain::BlockId;
-    use bdk_testenv::TestEnv;
-    use electrsd::bitcoind::bitcoincore_rpc::RpcApi;
+    use bdk_testenv::{
+        electrsd::bitcoind::{anyhow::Result, bitcoincore_rpc::RpcApi},
+        TestEnv,
+    };
     use esplora_client::{BlockHash, Builder};
     use std::collections::{BTreeMap, BTreeSet};
     use std::time::Duration;
@@ -429,7 +431,7 @@ mod test {
 
     /// Ensure that update does not remove heights (from original), and all anchor heights are included.
     #[test]
-    pub fn test_finalize_chain_update() -> anyhow::Result<()> {
+    pub fn test_finalize_chain_update() -> Result<()> {
         struct TestCase<'a> {
             name: &'a str,
             /// Initial blockchain height to start the env with.
@@ -492,7 +494,7 @@ mod test {
                 let anchors = t
                     .initial_cps
                     .iter()
-                    .map(|&height| -> anyhow::Result<_> {
+                    .map(|&height| -> Result<_> {
                         Ok((
                             BlockId {
                                 height,
@@ -501,7 +503,7 @@ mod test {
                             Txid::all_zeros(),
                         ))
                     })
-                    .collect::<anyhow::Result<BTreeSet<_>>>()?;
+                    .collect::<Result<BTreeSet<_>>>()?;
                 let update = chain_update(
                     &client,
                     &fetch_latest_blocks(&client)?,
@@ -529,7 +531,7 @@ mod test {
                 let anchors = t
                     .anchors
                     .iter()
-                    .map(|&(height, txid)| -> anyhow::Result<_> {
+                    .map(|&(height, txid)| -> Result<_> {
                         Ok((
                             BlockId {
                                 height,
@@ -538,7 +540,7 @@ mod test {
                             txid,
                         ))
                     })
-                    .collect::<anyhow::Result<_>>()?;
+                    .collect::<Result<_>>()?;
                 chain_update(
                     &client,
                     &fetch_latest_blocks(&client)?,
@@ -592,7 +594,7 @@ mod test {
     }
 
     #[test]
-    fn update_local_chain() -> anyhow::Result<()> {
+    fn update_local_chain() -> Result<()> {
         const TIP_HEIGHT: u32 = 50;
 
         let env = TestEnv::new()?;