rabbit

Author: ntheile

crates/lni/cln/api.rs

@@ -427,7 +427,15 @@ pub fn lookup_invoice(
     limit: Option<i64>,
 ) -> Result<Transaction, ApiError> {
     match lookup_invoices(url, rune, payment_hash, from, limit) {
-        Ok(transactions) => Ok(transactions.first().unwrap().clone()),
+        Ok(transactions) => {
+            if let Some(tx) = transactions.first() {
+                Ok(tx.clone())
+            } else {
+                Err(ApiError::Api {
+                    reason: "No matching invoice found".to_string(),
+                })
+            }
+        }
         Err(e) => Err(e),
     }
 }

crates/lni/phoenixd/api.rs

@@ -119,8 +119,12 @@ pub async fn pay_invoice(
         .send()
         .unwrap();
     println!("Status: {}", response.status());
+    let response_text = response.text().unwrap();
     let pay_invoice_resp: PhoenixPayInvoiceResp =
-        serde_json::from_str(&response.text().unwrap()).unwrap();
+        serde_json::from_str(&response_text).map_err(|e| ApiError::Json {
+            reason: format!("Failed to parse pay_invoice response: {}", e),
+        })?;
+
     Ok(PayInvoiceResponse {
         payment_hash: pay_invoice_resp.payment_hash,
         preimage: pay_invoice_resp.preimage,

crates/lni/utils.rs

@@ -1,15 +1,15 @@
 use lightning_invoice::Bolt11Invoice;
 use std::error::Error;
 use std::str::FromStr;
-use regex::Regex;
 
 pub fn calculate_fee_msats(
     bolt11: &str,
     fee_percentage: f64,
     amount_msats: Option<u64>,
 ) -> Result<u64, Box<dyn Error>> {
     // Decode the BOLT11 invoice
-    let invoice = Bolt11Invoice::from_str(bolt11).unwrap();
+    let invoice = Bolt11Invoice::from_str(bolt11)
+        .map_err(|e| format!("Failed to parse BOLT11 invoice: {}", e))?;
 
     println!("invoice: {:?}", invoice);