fix module name conflict

BitSwap-BiFi · Jun 30, 2024 · 08ec7a6 · 08ec7a6
1 parent d591d70
commit 08ec7a6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/cli/src/args.rs b/cli/src/args.rs
@@ -28,9 +28,10 @@ use std::path::Path;
 use bpstd::{Wpkh, XpubDerivable};
 use bpwallet::cli::{Args as BpArgs, Config, DescriptorOpts};
 use bpwallet::Wallet;
-use rgb::{AnyResolver, RgbDescr, StoredStock, StoredWallet, TapretKey, WalletError};
-use rgbstd::persistence::fs::{LoadFs, StoreFs};
-use rgbstd::persistence::Stock;
+use rgb::persistence::fs::{LoadFs, StoreFs};
+use rgb::persistence::Stock;
+use rgb::resolvers::AnyResolver;
+use rgb::{RgbDescr, StoredStock, StoredWallet, TapretKey, WalletError};
 use strict_types::encoding::{DecodeError, DeserializeError};
 
 use crate::Command;

diff --git a/src/resolvers/any.rs → src/indexers/any.rs b/src/resolvers/any.rs → src/indexers/any.rs
diff --git a/src/resolvers/electrum_blocking.rs → src/indexers/electrum_blocking.rs b/src/resolvers/electrum_blocking.rs → src/indexers/electrum_blocking.rs
diff --git a/src/resolvers/esplora_blocking.rs → src/indexers/esplora_blocking.rs b/src/resolvers/esplora_blocking.rs → src/indexers/esplora_blocking.rs
diff --git a/src/resolvers/mod.rs → src/indexers/mod.rs b/src/resolvers/mod.rs → src/indexers/mod.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -26,8 +26,7 @@ extern crate amplify;
 extern crate serde_crate as serde;
 
 mod descriptor;
-#[allow(hidden_glob_reexports)]
-mod resolvers;
+mod indexers;
 mod wallet;
 pub mod pay;
 mod errors;
@@ -37,9 +36,14 @@ mod store;
 pub use descriptor::{DescriptorRgb, RgbDescr, RgbKeychain, TapTweakAlreadyAssigned, TapretKey};
 pub use errors::{CompletionError, CompositionError, HistoryError, PayError, WalletError};
 pub use pay::{TransferParams, WalletProvider};
-#[cfg(any(feature = "electrum_blocking", feature = "esplora_blocking"))]
-pub use resolvers::*;
 pub use rgbstd::*;
+pub mod resolvers {
+    pub use rgbstd::resolvers::*;
+
+    #[cfg(any(feature = "electrum_blocking", feature = "esplora_blocking"))]
+    pub use super::indexers::*;
+    pub use super::indexers::{AnyResolver, RgbResolver};
+}
 #[cfg(feature = "fs")]
 pub use store::{StoredStock, StoredWallet};
 pub use wallet::{WalletStock, WalletWrapper};