Avoid options holding references in the public API

Author: TheBlueMatt

lightning/src/ln/async_payments_tests.rs

@@ -996,7 +996,7 @@ fn ignore_duplicate_invoice() {
 	match sender.onion_messenger.peel_onion_message(&invoice_om) {
 		Ok(PeeledOnion::Offers(OffersMessage::Invoice(invoice), context, _)) => {
 			assert!(matches!(
-				sender.node.send_payment_for_bolt12_invoice(&invoice, context.as_ref()),
+				sender.node.send_payment_for_bolt12_invoice(&invoice, context),
 				Err(Bolt12PaymentError::DuplicateInvoice)
 			))
 		},

lightning/src/ln/channelmanager.rs

@@ -5568,9 +5568,9 @@ where
 	///
 	/// [timer tick]: Self::timer_tick_occurred
 	pub fn send_payment_for_bolt12_invoice(
-		&self, invoice: &Bolt12Invoice, context: Option<&OffersContext>,
+		&self, invoice: &Bolt12Invoice, context: Option<OffersContext>,
 	) -> Result<(), Bolt12PaymentError> {
-		match self.verify_bolt12_invoice(invoice, context) {
+		match self.verify_bolt12_invoice(invoice, context.as_ref()) {
 			Ok(payment_id) => self.send_payment_for_verified_bolt12_invoice(invoice, payment_id),
 			Err(()) => Err(Bolt12PaymentError::UnexpectedInvoice),
 		}

lightning/src/ln/offers_tests.rs

@@ -1321,9 +1321,9 @@ fn pays_bolt12_invoice_asynchronously() {
 		assert_eq!(path.introduction_node(), &IntroductionNode::NodeId(alice_id));
 	}
 
-	assert!(bob.node.send_payment_for_bolt12_invoice(&invoice, context.as_ref()).is_ok());
+	assert!(bob.node.send_payment_for_bolt12_invoice(&invoice, context.clone()).is_ok());
 	assert_eq!(
-		bob.node.send_payment_for_bolt12_invoice(&invoice, context.as_ref()),
+		bob.node.send_payment_for_bolt12_invoice(&invoice, context.clone()),
 		Err(Bolt12PaymentError::DuplicateInvoice),
 	);
 
@@ -1334,7 +1334,7 @@ fn pays_bolt12_invoice_asynchronously() {
 	expect_recent_payment!(bob, RecentPaymentDetails::Fulfilled, payment_id);
 
 	assert_eq!(
-		bob.node.send_payment_for_bolt12_invoice(&invoice, context.as_ref()),
+		bob.node.send_payment_for_bolt12_invoice(&invoice, context.clone()),
 		Err(Bolt12PaymentError::DuplicateInvoice),
 	);
 
@@ -1343,7 +1343,7 @@ fn pays_bolt12_invoice_asynchronously() {
 	}
 
 	assert_eq!(
-		bob.node.send_payment_for_bolt12_invoice(&invoice, context.as_ref()),
+		bob.node.send_payment_for_bolt12_invoice(&invoice, context),
 		Err(Bolt12PaymentError::UnexpectedInvoice),
 	);
 }