ci: fix feature gates

.github/workflows/build.yml

@@ -35,6 +35,7 @@ jobs:
           - serde
           - esplora
           - electrum
+          - mempool
           - fs
           - cli
           - cli,hot

src/cli/args.rs

@@ -32,7 +32,7 @@ use strict_encoding::Ident;
 use crate::cli::{
     Config, DescrStdOpts, DescriptorOpts, ExecError, GeneralOpts, ResolverOpt, WalletOpts,
 };
-use crate::indexers::Client as IndexerClient;
+use crate::indexers::esplora;
 use crate::{AnyIndexer, MayError, Wallet};
 
 /// Command-line arguments
@@ -98,10 +98,10 @@ impl<C: Clone + Eq + Debug + Subcommand, O: DescriptorOpts> Args<C, O> {
         let network = self.general.network.to_string();
         Ok(match (&self.resolver.esplora, &self.resolver.electrum, &self.resolver.mempool) {
             (None, Some(url), None) => AnyIndexer::Electrum(Box::new(electrum::Client::new(url)?)),
-            (Some(url), None, None) => AnyIndexer::Esplora(Box::new(IndexerClient::new_esplora(
+            (Some(url), None, None) => AnyIndexer::Esplora(Box::new(esplora::Client::new_esplora(
                 &url.replace("{network}", &network),
             )?)),
-            (None, None, Some(url)) => AnyIndexer::Mempool(Box::new(IndexerClient::new_mempool(
+            (None, None, Some(url)) => AnyIndexer::Mempool(Box::new(esplora::Client::new_mempool(
                 &url.replace("{network}", &network),
             )?)),
             _ => {

src/indexers/any.rs

@@ -44,8 +44,11 @@ pub enum AnyIndexer {
 impl AnyIndexer {
     pub fn name(&self) -> &'static str {
         match self {
+            #[cfg(feature = "electrum")]
             AnyIndexer::Electrum(_) => "electrum",
+            #[cfg(feature = "esplora")]
             AnyIndexer::Esplora(_) => "esplora",
+            #[cfg(feature = "mempool")]
             AnyIndexer::Mempool(_) => "mempool",
         }
     }

src/indexers/esplora.rs

@@ -152,6 +152,7 @@ fn get_scripthash_txs_all(
     let mut res = Vec::new();
     let mut last_seen = None;
     let script = derive.addr.script_pubkey();
+    #[cfg(feature = "mempool")]
     let address = derive.addr.to_string();
 
     loop {

src/indexers/mempool.rs

@@ -23,7 +23,7 @@
 use bpstd::Txid;
 use esplora::BlockingClient;
 
-impl super::Client {
+impl super::esplora::Client {
     /// Creates a new mempool client with the specified URL.
     ///
     /// # Arguments

src/indexers/mod.rs

@@ -21,20 +21,18 @@
 // limitations under the License.
 
 #[cfg(feature = "electrum")]
-mod electrum;
+pub mod electrum;
 #[cfg(feature = "esplora")]
-mod esplora;
+pub mod esplora;
 #[cfg(feature = "mempool")]
-mod mempool;
+pub mod mempool;
 #[cfg(any(feature = "electrum", feature = "esplora", feature = "mempool"))]
 mod any;
 
 #[cfg(any(feature = "electrum", feature = "esplora", feature = "mempool"))]
 pub use any::{AnyIndexer, AnyIndexerError};
 use bpstd::Tx;
 use descriptors::Descriptor;
-#[cfg(any(feature = "esplora", feature = "mempool"))]
-pub use esplora::Client;
 
 use crate::{Layer2, MayError, WalletCache, WalletDescr};
 

src/lib.rs

@@ -31,7 +31,7 @@ extern crate clap;
 #[cfg(feature = "log")]
 extern crate log;
 
-mod indexers;
+pub mod indexers;
 mod util;
 mod data;
 mod rows;
@@ -54,7 +54,7 @@ pub use hot::{HotArgs, HotCommand};
 #[cfg(feature = "hot")]
 pub use hot::{Seed, SeedType};
 pub use indexers::Indexer;
-#[cfg(any(feature = "electrum", feature = "esplora"))]
+#[cfg(any(feature = "electrum", feature = "esplora", feature = "mempool"))]
 pub use indexers::{AnyIndexer, AnyIndexerError};
 pub use layer2::{
     Layer2, Layer2Cache, Layer2Coin, Layer2Data, Layer2Descriptor, Layer2Tx, NoLayer2,