diff --git a/Cargo.toml b/Cargo.toml index 2e8b02cf9..e1425b7ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,10 +94,10 @@ reqwest-default-tls = ["esplora-client/async-https"] # Debug/Test features test-blockchains = ["bitcoincore-rpc", "electrum-client"] -test-electrum = ["electrum", "electrsd/electrs_0_8_10", "electrsd/bitcoind_22_0", "test-blockchains"] -test-rpc = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_22_0", "test-blockchains"] -test-rpc-legacy = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_0_20_0", "test-blockchains"] -test-esplora = ["electrsd/legacy", "electrsd/esplora_a33e97e1", "electrsd/bitcoind_22_0", "test-blockchains"] +test-electrum = ["electrum", "electrsd/electrs_0_8_10", "electrsd/bitcoind_22_1", "test-blockchains"] +test-rpc = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_22_1", "test-blockchains"] +test-rpc-legacy = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_0_20_2", "test-blockchains"] +test-esplora = ["electrsd/legacy", "electrsd/esplora_a33e97e1", "electrsd/bitcoind_22_1", "test-blockchains"] test-md-docs = ["electrum"] test-hardware-signer = ["hardware-signer"] @@ -111,7 +111,7 @@ miniscript = { version = "10.0", features = ["std"] } bitcoin = { version = "0.30", features = ["std"] } lazy_static = "1.4" env_logger = { version = "0.7", default-features = false } -electrsd = "0.24" +electrsd = "0.25" assert_matches = "1.5.0" [[example]] diff --git a/src/database/mod.rs b/src/database/mod.rs index fd835300d..caab9b943 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -188,6 +188,7 @@ pub(crate) trait DatabaseUtils: Database { .map(|o| o.is_some()) } + #[allow(dead_code)] fn get_raw_tx_or(&self, txid: &Txid, default: D) -> Result, Error> where D: FnOnce() -> Result, Error>, diff --git a/src/lib.rs b/src/lib.rs index 084314552..fd13c5fb4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -206,17 +206,17 @@ extern crate serde_json; #[cfg(feature = "hardware-signer")] pub extern crate hwi; -#[cfg(all(feature = "reqwest", feature = "ureq"))] -compile_error!("Features reqwest and ureq are mutually exclusive and cannot be enabled together"); +#[cfg(all(feature = "use-esplora-async", feature = "use-esplora-blocking"))] +compile_error!("Features use-esplora-async and use-esplora-blocking are mutually exclusive and cannot be enabled together"); #[cfg(all(feature = "async-interface", feature = "electrum"))] compile_error!( "Features async-interface and electrum are mutually exclusive and cannot be enabled together" ); -#[cfg(all(feature = "async-interface", feature = "ureq"))] +#[cfg(all(feature = "async-interface", feature = "use-esplora-blocking"))] compile_error!( - "Features async-interface and ureq are mutually exclusive and cannot be enabled together" + "Features async-interface and use-esplora-blocking are mutually exclusive and cannot be enabled together" ); #[cfg(all(feature = "async-interface", feature = "compact_filters"))]