[ci] Fix all-keys and cli-utils tests

diff --git a/examples/repl.rs b/examples/repl.rs
index bcd9a9fb3b5ddacaf4760dc5f04a13a960ecc69d..dc6a688e67f1330fac064fa0c81ef48e8a110373 100644 (file)
--- a/examples/repl.rs
+++ b/examples/repl.rs
@@ -37,8 +37,9 @@ use log::{debug, error, info, trace, LevelFilter};
 use bitcoin::Network;
 
 use bdk::bitcoin;
-use bdk::blockchain::electrum::{ElectrumBlockchain, ElectrumBlockchainConfig};
 use bdk::blockchain::ConfigurableBlockchain;
+use bdk::blockchain::ElectrumBlockchain;
+use bdk::blockchain::ElectrumBlockchainConfig;
 use bdk::cli;
 use bdk::sled;
 use bdk::Wallet;

diff --git a/src/blockchain/compact_filters/mod.rs b/src/blockchain/compact_filters/mod.rs
index f1ca414c3b6714b45062577b9e03834ae597e4f2..233ea89acb7dd9a20c051523b843b0f26ade631a 100644 (file)
--- a/src/blockchain/compact_filters/mod.rs
+++ b/src/blockchain/compact_filters/mod.rs
@@ -55,7 +55,7 @@
 //!     ))
 //!     .collect::<Result<_, _>>()?;
 //! let blockchain = CompactFiltersBlockchain::new(peers, "./wallet-filters", Some(500_000))?;
-//! # Ok::<(), bdk::error::Error>(())
+//! # Ok::<(), CompactFiltersError>(())
 //! ```
 
 use std::collections::HashSet;

diff --git a/src/blockchain/mod.rs b/src/blockchain/mod.rs
index 5119e5147f4f2d1461bb0e1edb5ed45b439ddd16..83b6903de669d5113173bc7806f8d3058e4ee4ff 100644 (file)
--- a/src/blockchain/mod.rs
+++ b/src/blockchain/mod.rs
@@ -52,6 +52,8 @@ pub use any::{AnyBlockchain, AnyBlockchainConfig};
 pub mod electrum;
 #[cfg(feature = "electrum")]
 pub use self::electrum::ElectrumBlockchain;
+#[cfg(feature = "electrum")]
+pub use self::electrum::ElectrumBlockchainConfig;
 
 #[cfg(feature = "esplora")]
 #[cfg_attr(docsrs, doc(cfg(feature = "esplora")))]

diff --git a/src/keys/bip39.rs b/src/keys/bip39.rs
index 5d446c91f0685af2e3070ac7f56b93352f775aed..bf9837c426d78e8f8ccad3079ff64a6c5ec5e600 100644 (file)
--- a/src/keys/bip39.rs
+++ b/src/keys/bip39.rs
@@ -136,7 +136,7 @@ mod test {
         let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
             Mnemonic::generate_with_entropy(
                 (MnemonicType::Words12, Language::English),
-                crate::keys::test::get_test_entropy(),
+                crate::keys::test::TEST_ENTROPY,
             )
             .unwrap();
         assert_eq!(generated_mnemonic.valid_networks, any_network());
@@ -148,7 +148,7 @@ mod test {
         let generated_mnemonic: GeneratedKey<_, miniscript::Segwitv0> =
             Mnemonic::generate_with_entropy(
                 (MnemonicType::Words24, Language::English),
-                crate::keys::test::get_test_entropy(),
+                crate::keys::test::TEST_ENTROPY,
             )
             .unwrap();
         assert_eq!(generated_mnemonic.valid_networks, any_network());

diff --git a/src/keys/mod.rs b/src/keys/mod.rs
index 34b294066eb4bf76ed209599a011b33390da35ee..0684231787a8aac648180b61a5225ed4ea30b1af 100644 (file)
--- a/src/keys/mod.rs
+++ b/src/keys/mod.rs
@@ -578,7 +578,7 @@ pub mod test {
 
     use super::*;
 
-    const TEST_ENTROPY: [u8; 32] = [0xAA; 32];
+    pub const TEST_ENTROPY: [u8; 32] = [0xAA; 32];
 
     #[test]
     fn test_keys_generate_xprv() {