diff --git a/crates/electrum/Cargo.toml b/crates/electrum/Cargo.toml index b85ef9fb22..ef5051d68d 100644 --- a/crates/electrum/Cargo.toml +++ b/crates/electrum/Cargo.toml @@ -18,5 +18,4 @@ electrum-client = { version = "0.19" } [dev-dependencies] bdk_testenv = { path = "../testenv", default-features = false } -electrsd = { version= "0.27.1", features = ["bitcoind_25_0", "esplora_a33e97e1", "legacy"] } anyhow = "1" \ No newline at end of file diff --git a/crates/electrum/tests/test_electrum.rs b/crates/electrum/tests/test_electrum.rs index 8f77209fcb..da5a3d0cee 100644 --- a/crates/electrum/tests/test_electrum.rs +++ b/crates/electrum/tests/test_electrum.rs @@ -6,8 +6,7 @@ use bdk_chain::{ ConfirmationTimeHeightAnchor, IndexedTxGraph, SpkTxOutIndex, }; use bdk_electrum::{ElectrumExt, ElectrumUpdate}; -use bdk_testenv::TestEnv; -use electrsd::bitcoind::bitcoincore_rpc::RpcApi; +use bdk_testenv::{electrsd::bitcoind::bitcoincore_rpc::RpcApi, TestEnv}; fn get_balance( recv_chain: &LocalChain, diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index 201fddea0c..3cca71a892 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -23,7 +23,6 @@ miniscript = { version = "11.0.0", optional = true, default-features = false } [dev-dependencies] 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" diff --git a/crates/esplora/src/async_ext.rs b/crates/esplora/src/async_ext.rs index 9d02646c62..e1ceb97071 100644 --- a/crates/esplora/src/async_ext.rs +++ b/crates/esplora/src/async_ext.rs @@ -409,8 +409,8 @@ mod test { local_chain::LocalChain, BlockId, }; + use bdk_testenv::electrsd::bitcoind::bitcoincore_rpc::RpcApi; use bdk_testenv::TestEnv; - use electrsd::bitcoind::bitcoincore_rpc::RpcApi; use esplora_client::Builder; use crate::async_ext::{chain_update, fetch_latest_blocks}; diff --git a/crates/esplora/src/blocking_ext.rs b/crates/esplora/src/blocking_ext.rs index 7037385690..f359d7bd1a 100644 --- a/crates/esplora/src/blocking_ext.rs +++ b/crates/esplora/src/blocking_ext.rs @@ -414,8 +414,8 @@ mod test { use bdk_chain::bitcoin::Txid; use bdk_chain::local_chain::LocalChain; use bdk_chain::BlockId; + use bdk_testenv::electrsd::bitcoind::bitcoincore_rpc::RpcApi; use bdk_testenv::TestEnv; - use electrsd::bitcoind::bitcoincore_rpc::RpcApi; use esplora_client::{BlockHash, Builder}; use std::collections::{BTreeMap, BTreeSet}; use std::time::Duration; diff --git a/crates/esplora/tests/async_ext.rs b/crates/esplora/tests/async_ext.rs index f6954fe11f..716df72728 100644 --- a/crates/esplora/tests/async_ext.rs +++ b/crates/esplora/tests/async_ext.rs @@ -1,6 +1,6 @@ use bdk_esplora::EsploraAsyncExt; -use electrsd::bitcoind::anyhow; -use electrsd::bitcoind::bitcoincore_rpc::RpcApi; +use bdk_testenv::electrsd::bitcoind::anyhow; +use bdk_testenv::electrsd::bitcoind::bitcoincore_rpc::RpcApi; use esplora_client::{self, Builder}; use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::str::FromStr; diff --git a/crates/esplora/tests/blocking_ext.rs b/crates/esplora/tests/blocking_ext.rs index 40e446a4ed..69da886508 100644 --- a/crates/esplora/tests/blocking_ext.rs +++ b/crates/esplora/tests/blocking_ext.rs @@ -1,6 +1,6 @@ use bdk_esplora::EsploraExt; -use electrsd::bitcoind::anyhow; -use electrsd::bitcoind::bitcoincore_rpc::RpcApi; +use bdk_testenv::electrsd::bitcoind::anyhow; +use bdk_testenv::electrsd::bitcoind::bitcoincore_rpc::RpcApi; use esplora_client::{self, Builder}; use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::str::FromStr; diff --git a/crates/testenv/src/lib.rs b/crates/testenv/src/lib.rs index 2edd06eb20..2a0c37cda7 100644 --- a/crates/testenv/src/lib.rs +++ b/crates/testenv/src/lib.rs @@ -11,6 +11,7 @@ use bitcoincore_rpc::{ bitcoincore_rpc_json::{GetBlockTemplateModes, GetBlockTemplateRules}, RpcApi, }; +pub use electrsd; use electrsd::electrum_client::ElectrumApi; use std::time::Duration;