fixup: simplify types for receive_via_jit_channel_manual_claim

Author: martinsaposnic

src/ffi/types.rs

@@ -1184,13 +1184,6 @@ pub struct JitChannelManualClaim {
 	pub preimage: PaymentPreimage,
 }
 
-impl From<(Arc<Bolt11Invoice>, PaymentPreimage)> for JitChannelManualClaim {
-	fn from(value: (Arc<Bolt11Invoice>, PaymentPreimage)) -> Self {
-		let (invoice, preimage) = value;
-		JitChannelManualClaim { invoice, preimage }
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use std::{

src/payment/bolt11.rs

@@ -50,7 +50,10 @@ type Bolt11InvoiceDescription = LdkBolt11InvoiceDescription;
 type Bolt11InvoiceDescription = crate::ffi::Bolt11InvoiceDescription;
 
 #[cfg(not(feature = "uniffi"))]
-type JitChannelManualClaim = (Bolt11Invoice, PaymentPreimage);
+pub struct JitChannelManualClaim {
+    pub invoice: Bolt11Invoice,
+    pub preimage: PaymentPreimage,
+}
 #[cfg(feature = "uniffi")]
 type JitChannelManualClaim = crate::ffi::JitChannelManualClaim;
 
@@ -619,7 +622,8 @@ impl Bolt11Payment {
 			false,
 		)?;
 		let preimage = preimage.ok_or(Error::InvoiceCreationFailed)?;
-		Ok((maybe_wrap(invoice), preimage).into())
+		let invoice = maybe_wrap(invoice);
+		Ok(JitChannelManualClaim { invoice, preimage })
 	}
 
 	/// Returns a payable invoice that can be used to request a variable amount payment (also known

tests/integration_tests_rust.rs

@@ -1779,16 +1779,18 @@ fn lsps2_client_trusts_lsp() {
 		Bolt11InvoiceDescription::Direct(Description::new(String::from("asdf")).unwrap());
 	let jit_amount_msat = 100_000_000;
 
-	println!("Generating JIT invoice!");
-	let (jit_invoice, preimage) = client_node
-		.bolt11_payment()
-		.receive_via_jit_channel_manual_claim(
-			jit_amount_msat,
-			&invoice_description.into(),
-			1024,
-			None,
-		)
-		.unwrap();
+    println!("Generating JIT invoice!");
+    let res = client_node
+        .bolt11_payment()
+        .receive_via_jit_channel_manual_claim(
+            jit_amount_msat,
+            &invoice_description.into(),
+            1024,
+            None,
+        )
+        .unwrap();
+    let jit_invoice = res.invoice;
+    let preimage = res.preimage;
 
 	// Have the payer_node pay the invoice, therby triggering channel open service_node -> client_node.
 	println!("Paying JIT invoice!");
@@ -1920,16 +1922,17 @@ fn lsps2_lsp_trusts_client_but_client_does_not_claim() {
 		Bolt11InvoiceDescription::Direct(Description::new(String::from("asdf")).unwrap());
 	let jit_amount_msat = 100_000_000;
 
-	println!("Generating JIT invoice!");
-	let (jit_invoice, _) = client_node
-		.bolt11_payment()
-		.receive_via_jit_channel_manual_claim(
-			jit_amount_msat,
-			&invoice_description.into(),
-			1024,
-			None,
-		)
-		.unwrap();
+    println!("Generating JIT invoice!");
+    let res = client_node
+        .bolt11_payment()
+        .receive_via_jit_channel_manual_claim(
+            jit_amount_msat,
+            &invoice_description.into(),
+            1024,
+            None,
+        )
+        .unwrap();
+    let jit_invoice = res.invoice;
 
 	// Have the payer_node pay the invoice, therby triggering channel open service_node -> client_node.
 	println!("Paying JIT invoice!");