f rename

Author: TheBlueMatt

lightning/src/blinded_path/message.rs

@@ -424,7 +424,7 @@ pub enum OffersContext {
 	/// [`Refund`]: crate::offers::refund::Refund
 	/// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
 	/// [`InvoiceError`]: crate::offers::invoice_error::InvoiceError
-	OutboundPaymentInRefund {
+	OutboundPaymentForRefund {
 		/// Payment ID used when creating a [`Refund`].
 		///
 		/// [`Refund`]: crate::offers::refund::Refund
@@ -445,7 +445,7 @@ pub enum OffersContext {
 	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
 	/// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
 	/// [`InvoiceError`]: crate::offers::invoice_error::InvoiceError
-	OutboundPaymentInInvReq {
+	OutboundPaymentForOffer {
 		/// Payment ID used when creating an [`InvoiceRequest`].
 		///
 		/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
@@ -636,7 +636,7 @@ impl_writeable_tlv_based_enum!(OffersContext,
 	(0, InvoiceRequest) => {
 		(0, nonce, required),
 	},
-	(1, OutboundPaymentInRefund) => {
+	(1, OutboundPaymentForRefund) => {
 		(0, payment_id, required),
 		(1, nonce, required),
 	},
@@ -648,7 +648,7 @@ impl_writeable_tlv_based_enum!(OffersContext,
 		(2, invoice_slot, required),
 		(4, path_absolute_expiry, required),
 	},
-	(4, OutboundPaymentInInvReq) => {
+	(4, OutboundPaymentForOffer) => {
 		(0, payment_id, required),
 		(1, nonce, required),
 	},

lightning/src/ln/channelmanager.rs

@@ -15349,7 +15349,7 @@ where
 			},
 			OffersMessage::StaticInvoice(invoice) => {
 				let payment_id = match context {
-					Some(OffersContext::OutboundPaymentInInvReq { payment_id, .. }) => payment_id,
+					Some(OffersContext::OutboundPaymentForOffer { payment_id, .. }) => payment_id,
 					_ => return None
 				};
 				let res = self.initiate_async_payment(&invoice, payment_id);
@@ -15365,8 +15365,8 @@ where
 				log_trace!(logger, "Received invoice_error: {}", invoice_error);
 
 				match context {
-					Some(OffersContext::OutboundPaymentInInvReq { payment_id, .. })
-					|Some(OffersContext::OutboundPaymentInRefund { payment_id, .. }) => {
+					Some(OffersContext::OutboundPaymentForOffer { payment_id, .. })
+					|Some(OffersContext::OutboundPaymentForRefund { payment_id, .. }) => {
 						self.abandon_payment_with_reason(
 							payment_id, PaymentFailureReason::InvoiceRequestRejected,
 						);

lightning/src/offers/flow.rs

@@ -498,8 +498,8 @@ where
 	/// Verifies a [`Bolt12Invoice`] using the provided [`OffersContext`] or the invoice's payer
 	/// metadata, returning the corresponding [`PaymentId`] if successful.
 	///
-	/// - If an [`OffersContext::OutboundPaymentInInvReq`] or
-	///   [`OffersContext::OutboundPaymentInRefund`] with a `nonce` is provided, verification is
+	/// - If an [`OffersContext::OutboundPaymentForOffer`] or
+	///   [`OffersContext::OutboundPaymentForRefund`] with a `nonce` is provided, verification is
 	///   performed using this to form the payer metadata.
 	/// - If no context is provided and the invoice corresponds to a [`Refund`] without blinded paths,
 	///   verification is performed using the [`Bolt12Invoice::payer_metadata`].
@@ -514,14 +514,14 @@ where
 			None if invoice.is_for_refund_without_paths() => {
 				invoice.verify_using_metadata(expanded_key, secp_ctx)
 			},
-			Some(&OffersContext::OutboundPaymentInInvReq { payment_id, nonce, .. }) => {
+			Some(&OffersContext::OutboundPaymentForOffer { payment_id, nonce, .. }) => {
 				if invoice.is_for_offer() {
 					invoice.verify_using_payer_data(payment_id, nonce, expanded_key, secp_ctx)
 				} else {
 					Err(())
 				}
 			},
-			Some(&OffersContext::OutboundPaymentInRefund { payment_id, nonce, .. }) => {
+			Some(&OffersContext::OutboundPaymentForRefund { payment_id, nonce, .. }) => {
 				if invoice.is_for_refund() {
 					invoice.verify_using_payer_data(payment_id, nonce, expanded_key, secp_ctx)
 				} else {
@@ -693,7 +693,7 @@ where
 
 		let nonce = Nonce::from_entropy_source(entropy);
 		let context =
-			MessageContext::Offers(OffersContext::OutboundPaymentInRefund { payment_id, nonce });
+			MessageContext::Offers(OffersContext::OutboundPaymentForRefund { payment_id, nonce });
 
 		// Create the base builder with common properties
 		let mut builder = RefundBuilder::deriving_signing_pubkey(
@@ -1130,7 +1130,7 @@ where
 		peers: Vec<MessageForwardNode>,
 	) -> Result<(), Bolt12SemanticError> {
 		let context =
-			MessageContext::Offers(OffersContext::OutboundPaymentInInvReq { payment_id, nonce });
+			MessageContext::Offers(OffersContext::OutboundPaymentForOffer { payment_id, nonce });
 		let reply_paths = self
 			.create_blinded_paths(peers, context)
 			.map_err(|_| Bolt12SemanticError::MissingPaths)?;