wip

Author: joostjager

src/payment/bolt11.rs

@@ -12,6 +12,7 @@
 use crate::config::{Config, LDK_PAYMENT_RETRY_TIMEOUT};
 use crate::connection::ConnectionManager;
 use crate::error::Error;
+use crate::hex_utils;
 use crate::liquidity::LiquiditySource;
 use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
 use crate::payment::store::{
@@ -842,3 +843,16 @@ impl TryFrom<&Bolt11InvoiceStringDescription> for Bolt11InvoiceDescription {
 		}
 	}
 }
+
+impl From<Bolt11InvoiceDescription> for Bolt11InvoiceStringDescription {
+	fn from(value: Bolt11InvoiceDescription) -> Self {
+		match value {
+			Bolt11InvoiceDescription::Direct(description) => {
+				Bolt11InvoiceStringDescription::Direct { description: description.to_string() }
+			},
+			Bolt11InvoiceDescription::Hash(hash) => {
+				Bolt11InvoiceStringDescription::Hash { hash: hex_utils::to_string(hash.0.as_ref()) }
+			},
+		}
+	}
+}

tests/common/mod.rs

@@ -10,7 +10,7 @@
 
 use ldk_node::config::{Config, EsploraSyncConfig};
 use ldk_node::io::sqlite_store::SqliteStore;
-use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus};
+use ldk_node::payment::{Bolt11InvoiceStringDescription, PaymentDirection, PaymentKind, PaymentStatus};
 use ldk_node::{
 	Builder, CustomTlvRecord, Event, LightningBalance, LogLevel, Node, NodeError,
 	PendingSweepBalance,
@@ -555,8 +555,10 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 	let invoice_amount_1_msat = 2500_000;
 	let invoice_description: Bolt11InvoiceDescription =
 		Bolt11InvoiceDescription::Direct(Description::new(String::from("asdf")).unwrap());
-	let invoice =
-		node_b.bolt11_payment().receive(invoice_amount_1_msat, &invoice_description, 9217).unwrap();
+	let invoice = node_b
+		.bolt11_payment()
+		.receive(invoice_amount_1_msat, &invoice_description.clone().into(), 9217)
+		.unwrap();
 
 	println!("\nA send");
 	let payment_id = node_a.bolt11_payment().send(&invoice, None).unwrap();
@@ -603,7 +605,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 	// Test under-/overpayment
 	let invoice_amount_2_msat = 2500_000;
 	let invoice =
-		node_b.bolt11_payment().receive(invoice_amount_2_msat, &invoice_description, 9217).unwrap();
+		node_b.bolt11_payment().receive(invoice_amount_2_msat, &invoice_description.clone().into(), 9217).unwrap();
 
 	let underpaid_amount = invoice_amount_2_msat - 1;
 	assert_eq!(
@@ -613,7 +615,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 
 	println!("\nB overpaid receive");
 	let invoice =
-		node_b.bolt11_payment().receive(invoice_amount_2_msat, &invoice_description, 9217).unwrap();
+		node_b.bolt11_payment().receive(invoice_amount_2_msat, &invoice_description.clone().into(), 9217).unwrap();
 	let overpaid_amount_msat = invoice_amount_2_msat + 100;
 
 	println!("\nA overpaid send");
@@ -643,7 +645,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 	// Test "zero-amount" invoice payment
 	println!("\nB receive_variable_amount_payment");
 	let variable_amount_invoice =
-		node_b.bolt11_payment().receive_variable_amount(&invoice_description, 9217).unwrap();
+		node_b.bolt11_payment().receive_variable_amount(&invoice_description.clone().into(), 9217).unwrap();
 	let determined_amount_msat = 2345_678;
 	assert_eq!(
 		Err(NodeError::InvalidInvoice),
@@ -682,7 +684,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 	let manual_payment_hash = PaymentHash(Sha256::hash(&manual_preimage.0).to_byte_array());
 	let manual_invoice = node_b
 		.bolt11_payment()
-		.receive_for_hash(invoice_amount_3_msat, &invoice_description, 9217, manual_payment_hash)
+		.receive_for_hash(invoice_amount_3_msat, &invoice_description.clone().into(), 9217, manual_payment_hash)
 		.unwrap();
 	let manual_payment_id = node_a.bolt11_payment().send(&manual_invoice, None).unwrap();
 
@@ -722,7 +724,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 		.bolt11_payment()
 		.receive_for_hash(
 			invoice_amount_3_msat,
-			&invoice_description,
+			&invoice_description.into(),
 			9217,
 			manual_fail_payment_hash,
 		)

tests/integration_tests_rust.rs

@@ -192,7 +192,7 @@ fn multi_hop_sending() {
 
 	let invoice_description =
 		Bolt11InvoiceDescription::Direct(Description::new(String::from("asdf")).unwrap());
-	let invoice = nodes[4].bolt11_payment().receive(2_500_000, &invoice_description, 9217).unwrap();
+	let invoice = nodes[4].bolt11_payment().receive(2_500_000, &invoice_description.clone().into(), 9217).unwrap();
 	nodes[0].bolt11_payment().send(&invoice, Some(sending_params)).unwrap();
 
 	expect_event!(nodes[1], PaymentForwarded);