fix: add pub fields back to client structs

lsunsi · Dec 11, 2023 · 64d1c04 · 64d1c04
1 parent 7103438
commit 64d1c04
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 35 deletions.
diff --git a/src/core/channel/client.rs b/src/core/channel/client.rs
@@ -1,8 +1,8 @@
 #[derive(Clone, Debug)]
 pub struct Response {
-    callback: url::Url,
+    pub callback: url::Url,
     pub uri: String,
-    k1: String,
+    pub k1: String,
 }
 
 impl std::str::FromStr for Response {

diff --git a/src/core/pay/client.rs b/src/core/pay/client.rs
@@ -1,6 +1,6 @@
 #[derive(Clone, Debug)]
 pub struct Response {
-    callback: url::Url,
+    pub callback: url::Url,
     pub metadata_raw: String,
     pub short_description: String,
     pub long_description: Option<String>,

diff --git a/src/core/withdraw/client.rs b/src/core/withdraw/client.rs
@@ -1,7 +1,7 @@
 #[derive(Clone, Debug)]
 pub struct Response {
-    k1: String,
-    callback: url::Url,
+    pub k1: String,
+    pub callback: url::Url,
     pub description: String,
     pub min: u64,
     pub max: u64,

diff --git a/src/core/withdraw/server.rs b/src/core/withdraw/server.rs
@@ -1,3 +1,4 @@
+#[derive(Clone, Debug)]
 pub struct Response {
     pub k1: String,
     pub callback: url::Url,

diff --git a/tests/real.rs b/tests/real.rs
@@ -7,6 +7,10 @@ mod pay_request {
             panic!("parse");
         };
 
+        assert_eq!(
+            pr.callback.as_str(),
+            "https://getalby.com/lnurlp/lorenzo/callback"
+        );
         assert_eq!(pr.short_description, "Sats for lorenzo");
         assert!(pr.long_description.is_none());
 
@@ -16,11 +20,6 @@ mod pay_request {
 
         assert!(pr.jpeg.is_none());
         assert!(pr.png.is_none());
-
-        assert_eq!(
-            pr.callback(314, None).to_string(),
-            "https://getalby.com/lnurlp/lorenzo/callback?amount=314"
-        );
     }
 
     #[test]
@@ -31,6 +30,10 @@ mod pay_request {
             panic!("parse");
         };
 
+        assert_eq!(
+            pr.callback.as_str(),
+            "https://pay.mainnet.galoy.io/lnurlp/lorenzo/callback"
+        );
         assert_eq!(pr.short_description, "Payment to lorenzo");
         assert!(pr.long_description.is_none());
 
@@ -40,11 +43,6 @@ mod pay_request {
 
         assert!(pr.jpeg.is_none());
         assert!(pr.png.is_none());
-
-        assert_eq!(
-            pr.callback(314, None).to_string(),
-            "https://pay.mainnet.galoy.io/lnurlp/lorenzo/callback?amount=314"
-        );
     }
 
     #[test]
@@ -55,6 +53,10 @@ mod pay_request {
             panic!("parse");
         };
 
+        assert_eq!(
+            pr.callback.as_str(),
+            "https://api.bipa.app/ln/request/invoice/kenu/1701784379/50n3BjOSWb1ZrxE9WmRcqlk2ylDzUJ1Q_GHN0pk_Q7Q/P6IMTO82jj6W21mUvXNgIlGmqGibx8MiaWfSjQ2wI88"
+        );
         assert_eq!(pr.short_description, "$kenu ⚡ bipa.app");
         assert!(pr.long_description.is_none());
 
@@ -64,11 +66,6 @@ mod pay_request {
 
         assert!(pr.jpeg.is_none());
         assert_eq!(pr.png.as_ref().unwrap().len(), 54697);
-
-        assert_eq!(
-            pr.callback(314, None).to_string(),
-            "https://api.bipa.app/ln/request/invoice/kenu/1701784379/50n3BjOSWb1ZrxE9WmRcqlk2ylDzUJ1Q_GHN0pk_Q7Q/P6IMTO82jj6W21mUvXNgIlGmqGibx8MiaWfSjQ2wI88?amount=314"
-        );
     }
 
     #[test]
@@ -79,6 +76,10 @@ mod pay_request {
             panic!("parse");
         };
 
+        assert_eq!(
+            pr.callback.as_str(),
+            "https://app.pouch.ph/api/v2/lnurl/pay/ethan"
+        );
         assert_eq!(pr.short_description, "Lightning payment to ethan@pouch.ph");
         assert!(pr.long_description.is_none());
 
@@ -88,11 +89,6 @@ mod pay_request {
 
         assert!(pr.jpeg.is_none());
         assert!(pr.png.is_none());
-
-        assert_eq!(
-            pr.callback(314, None).to_string(),
-            "https://app.pouch.ph/api/v2/lnurl/pay/ethan?amount=314"
-        );
     }
 
     #[test]
@@ -103,6 +99,10 @@ mod pay_request {
             panic!("parse");
         };
 
+        assert_eq!(
+            pr.callback.as_str(),
+            "https://livingroomofsatoshi.com/api/v1/lnurl/payreq/0e7f30e3-e74d-410d-bf86-50d101715e81"
+        );
         assert_eq!(
             pr.short_description,
             "Pay to Wallet of Satoshi user: wailingcity51"
@@ -115,11 +115,6 @@ mod pay_request {
 
         assert!(pr.jpeg.is_none());
         assert!(pr.png.is_none());
-
-        assert_eq!(
-            pr.callback(314, None).to_string(),
-            "https://livingroomofsatoshi.com/api/v1/lnurl/payreq/0e7f30e3-e74d-410d-bf86-50d101715e81?amount=314"
-        );
     }
 
     #[test]
@@ -130,6 +125,10 @@ mod pay_request {
             panic!("parse");
         };
 
+        assert_eq!(
+            pr.callback.as_str(),
+            "https://api.zebedee.io/v0/process-static-charges/8d648ac7-09f6-400c-8479-d05ac4d9d61d"
+        );
         assert_eq!(pr.short_description, "luhack - Welcome to my zbd.gg page!");
         assert!(pr.long_description.is_none());
 
@@ -139,10 +138,5 @@ mod pay_request {
 
         assert!(pr.jpeg.is_none());
         assert_eq!(pr.png.as_ref().unwrap().len(), 3993);
-
-        assert_eq!(
-            pr.callback(314, None).to_string(),
-            "https://api.zebedee.io/v0/process-static-charges/8d648ac7-09f6-400c-8479-d05ac4d9d61d?amount=314"
-        );
     }
 }