Merge branch 'payment_req_improve'

Author: LeoComandini

lwk_payment_instructions/src/lib.rs

@@ -257,7 +257,7 @@ fn parse_liquid_bip21(s: &str, is_mainnet: bool) -> Result<Payment, String> {
         .query_pairs()
         .find(|(key, _)| key == "assetid")
         .map(|(_, value)| value)
-        .ok_or_else(|| "error".to_string())?;
+        .ok_or_else(|| "Invalid payment request: assetID needs to be specified".to_string())?;
     let asset = AssetId::from_str(&asset_str).map_err(|e| e.to_string())?;
 
     // BIP21 amounts are in BTC (decimal), convert to satoshis (optional)
@@ -521,6 +521,16 @@ mod tests {
         let _payment_category = Payment::from_str(liquid_bip21).unwrap();
     }
 
+    #[test]
+    fn test_parse_liquid_bip21_missing_asset() {
+        let liquid_bip21 = "liquidnetwork:VJL67HETqJCTg8Jak34N4RQaZD8HopbuhiU6F5kdo4d8QBJKTNJY3N1ictsXc1KAVNpaTEuCEoUCAzEj?amount=0.00001000";
+        let err = Payment::from_str(liquid_bip21).unwrap_err();
+        assert_eq!(
+            err,
+            "Invalid payment request: assetID needs to be specified"
+        );
+    }
+
     #[test]
     fn test_parse_no_schema() {
         let bitcoin_address = "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa";