From 2605cbedd62ead03caa8d28a3482a297680b380b Mon Sep 17 00:00:00 2001
From: ok300 <106775972+ok300@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:14:05 +0200
Subject: [PATCH] sdk-common: simplify prelude

---
 libs/sdk-common/src/input_parser.rs | 5 +----
 libs/sdk-common/src/invoice.rs      | 3 ---
 libs/sdk-common/src/lib.rs          | 2 ++
 libs/sdk-common/src/liquid/mod.rs   | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libs/sdk-common/src/input_parser.rs b/libs/sdk-common/src/input_parser.rs
index f3ba0be50..3170f8a97 100644
--- a/libs/sdk-common/src/input_parser.rs
+++ b/libs/sdk-common/src/input_parser.rs
@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
+use ::bip21::Uri;
 use anyhow::{anyhow, Result};
-use bip21::Uri;
 use bitcoin::bech32;
 use bitcoin::bech32::FromBase32;
 use serde::{Deserialize, Serialize};
@@ -10,9 +10,6 @@ use LnUrlRequestData::*;
 
 use crate::prelude::*;
 
-#[cfg(feature = "liquid")]
-use self::liquid::bip21::LiquidAddressData;
-
 /// Parses generic user input, typically pasted from clipboard or scanned from a QR.
 ///
 /// # Examples
diff --git a/libs/sdk-common/src/invoice.rs b/libs/sdk-common/src/invoice.rs
index 2a61231f1..43fac1040 100644
--- a/libs/sdk-common/src/invoice.rs
+++ b/libs/sdk-common/src/invoice.rs
@@ -11,9 +11,6 @@ use serde::{Deserialize, Serialize};
 
 use crate::prelude::*;
 
-#[cfg(feature = "liquid")]
-use crate::liquid::{bip21::DeserializeError, LiquidAddressData};
-
 pub type InvoiceResult<T, E = InvoiceError> = Result<T, E>;
 
 #[derive(Debug, thiserror::Error)]
diff --git a/libs/sdk-common/src/lib.rs b/libs/sdk-common/src/lib.rs
index 2f26c6331..42671e9e0 100644
--- a/libs/sdk-common/src/lib.rs
+++ b/libs/sdk-common/src/lib.rs
@@ -31,6 +31,8 @@ pub mod prelude {
     pub use crate::buy::moonpay::*;
     pub use crate::input_parser::*;
     pub use crate::invoice::*;
+    #[cfg(feature = "liquid")]
+    pub use crate::liquid::*;
     pub use crate::lnurl::error::*;
     pub use crate::lnurl::model::*;
     pub use crate::lnurl::specs::auth::model::*;
diff --git a/libs/sdk-common/src/liquid/mod.rs b/libs/sdk-common/src/liquid/mod.rs
index 32dab7659..b481352fd 100644
--- a/libs/sdk-common/src/liquid/mod.rs
+++ b/libs/sdk-common/src/liquid/mod.rs
@@ -7,8 +7,7 @@ mod tests {
     use elements::AssetId;
 
     use crate::input_parser::tests::get_bip21_rounding_test_vectors;
-    use crate::input_parser::*;
-    use crate::liquid::LiquidAddressData;
+    use crate::prelude::*;
 
     #[tokio::test]
     async fn test_liquid_address_bip21_rounding() -> Result<()> {