Re-use and re-export lightning-invoice crate

Blockstream · Feb 8, 2024 · 9bcaf60 · 9bcaf60
1 parent e87f60e
commit 9bcaf60
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libs/gl-client/Cargo.toml b/libs/gl-client/Cargo.toml
@@ -23,7 +23,6 @@ bytes = "1.2.1"
 hex = "0.4.3"
 http = "0.2"
 http-body = "^0.4"
-lightning-invoice = "0.26.0"
 log = "^0.4"
 pin-project = "1.1.3"
 prost = "0.11"

diff --git a/libs/gl-client/src/lib.rs b/libs/gl-client/src/lib.rs
@@ -69,6 +69,7 @@ pub enum Error {
 }
 
 pub use lightning_signer::bitcoin;
+pub use lightning_signer::lightning_invoice;
 
 pub(crate) const TCP_KEEPALIVE: Duration = Duration::from_secs(30);
 pub(crate) const TCP_KEEPALIVE_TIMEOUT: Duration = Duration::from_secs(90);
diff --git a/libs/gl-client/src/lnurl/pay/mod.rs b/libs/gl-client/src/lnurl/pay/mod.rs
@@ -1,11 +1,13 @@
 use super::models;
 use super::utils::parse_lnurl;
+
+use crate::lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription};
 use crate::lnurl::{
     models::{LnUrlHttpClient, PayRequestCallbackResponse, PayRequestResponse},
     utils::parse_invoice,
 };
+
 use anyhow::{anyhow, ensure, Result};
-use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription};
 use log::debug;
 use reqwest::Url;
 use sha256;

diff --git a/libs/gl-client/src/lnurl/utils.rs b/libs/gl-client/src/lnurl/utils.rs
@@ -1,7 +1,9 @@
+use std::str::FromStr;
+
 use anyhow::{anyhow, Result};
 use bech32::FromBase32;
-use lightning_invoice::Bolt11Invoice;
-use std::str::FromStr;
+
+use crate::lightning_invoice::Bolt11Invoice;
 
 // Function to decode and parse the lnurl into a URL
 pub fn parse_lnurl(lnurl: &str) -> Result<String> {