use cfg! instead of #[cfg] and use semver

diff --git a/Cargo.toml b/Cargo.toml
index 133c0a69ff2f63816cb57ecf4cc52a18c89c2ad3..fb45a7629151cc9d9f4d805a4fc9404c482ff5a1 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ test-md-docs = ["electrum"]
 lazy_static = "1.4"
 env_logger = "0.7"
 clap = "2.33"
-electrsd = { version="0.4.0", features = ["trigger"] }
+electrsd = { version="0.4", features = ["trigger"] }
 
 [[example]]
 name = "address_validator"

diff --git a/src/testutils/blockchain_tests.rs b/src/testutils/blockchain_tests.rs
index 12f96dd91b5314865d4da0f0087d64c1b72107d0..a2174802c6f4af4c73895e1832a07cc4df05b5a2 100644 (file)
--- a/src/testutils/blockchain_tests.rs
+++ b/src/testutils/blockchain_tests.rs
@@ -26,10 +26,7 @@ impl TestClient {
         debug!("launching {} and {}", &bitcoind_exe, &electrs_exe);
         let bitcoind = BitcoinD::new(bitcoind_exe).unwrap();
 
-        #[cfg(feature = "test-esplora")]
-        let http_enabled = true;
-        #[cfg(not(feature = "test-esplora"))]
-        let http_enabled = false;
+        let http_enabled = cfg!(feature = "test-esplora");
 
         let electrsd = ElectrsD::new(electrs_exe, &bitcoind, false, http_enabled).unwrap();