From 4f7355ec82dfa053d9fd39f20695ada4e4f15e5a Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Wed, 28 Oct 2020 21:34:04 -0700
Subject: [PATCH] [ci] Fix all-keys and cli-utils tests

---
 examples/repl.rs                      | 3 ++-
 src/blockchain/compact_filters/mod.rs | 2 +-
 src/blockchain/mod.rs                 | 2 ++
 src/keys/bip39.rs                     | 4 ++--
 src/keys/mod.rs                       | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/examples/repl.rs b/examples/repl.rs
index bcd9a9fb..dc6a688e 100644
--- 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 f1ca414c..233ea89a 100644
--- 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 5119e514..83b6903d 100644
--- 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 5d446c91..bf9837c4 100644
--- 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 34b29406..06842317 100644
--- 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() {