Rename {Bolt12,Static}Invoice offer paths accessors to be more specific.

Author: valentinewallace

lightning/src/offers/invoice.rs

@@ -690,8 +690,8 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	/// From [`Offer::paths`] or [`Refund::paths`].
 	///
 	/// [`Offer::paths`]: crate::offers::offer::Offer::paths
-	pub fn message_paths(&$self) -> &[BlindedPath] {
-		$contents.message_paths()
+	pub fn request_paths(&$self) -> &[BlindedPath] {
+		$contents.request_paths()
 	}
 
 	/// The quantity of items supported.
@@ -726,9 +726,9 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	}
 
 	/// A possibly transient pubkey used to sign the invoice request or to send an invoice for a
-	/// refund in case there are no [`message_paths`].
+	/// refund in case there are no [`request_paths`].
 	///
-	/// [`message_paths`]: Self::message_paths
+	/// [`request_paths`]: Self::request_paths
 	pub fn payer_id(&$self) -> PublicKey {
 		$contents.payer_id()
 	}
@@ -891,7 +891,7 @@ impl InvoiceContents {
 		}
 	}
 
-	fn message_paths(&self) -> &[BlindedPath] {
+	fn request_paths(&self) -> &[BlindedPath] {
 		match self {
 			InvoiceContents::ForOffer { invoice_request, .. } => {
 				invoice_request.inner.offer.paths()
@@ -1468,7 +1468,7 @@ mod tests {
 		assert_eq!(unsigned_invoice.description(), Some(PrintableString("")));
 		assert_eq!(unsigned_invoice.offer_features(), Some(&OfferFeatures::empty()));
 		assert_eq!(unsigned_invoice.absolute_expiry(), None);
-		assert_eq!(unsigned_invoice.message_paths(), &[]);
+		assert_eq!(unsigned_invoice.request_paths(), &[]);
 		assert_eq!(unsigned_invoice.issuer(), None);
 		assert_eq!(unsigned_invoice.supported_quantity(), Some(Quantity::One));
 		assert_eq!(unsigned_invoice.signing_pubkey(), recipient_pubkey());
@@ -1510,7 +1510,7 @@ mod tests {
 		assert_eq!(invoice.description(), Some(PrintableString("")));
 		assert_eq!(invoice.offer_features(), Some(&OfferFeatures::empty()));
 		assert_eq!(invoice.absolute_expiry(), None);
-		assert_eq!(invoice.message_paths(), &[]);
+		assert_eq!(invoice.request_paths(), &[]);
 		assert_eq!(invoice.issuer(), None);
 		assert_eq!(invoice.supported_quantity(), Some(Quantity::One));
 		assert_eq!(invoice.signing_pubkey(), recipient_pubkey());
@@ -1607,7 +1607,7 @@ mod tests {
 		assert_eq!(invoice.description(), Some(PrintableString("")));
 		assert_eq!(invoice.offer_features(), None);
 		assert_eq!(invoice.absolute_expiry(), None);
-		assert_eq!(invoice.message_paths(), &[]);
+		assert_eq!(invoice.request_paths(), &[]);
 		assert_eq!(invoice.issuer(), None);
 		assert_eq!(invoice.supported_quantity(), None);
 		assert_eq!(invoice.signing_pubkey(), recipient_pubkey());

lightning/src/offers/static_invoice.rs

@@ -227,8 +227,8 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	/// publicly reachable nodes. Taken from [`Offer::paths`].
 	///
 	/// [`Offer::paths`]: crate::offers::offer::Offer::paths
-	pub fn offer_message_paths(&$self) -> &[BlindedPath] {
-		$contents.offer_message_paths()
+	pub fn request_paths(&$self) -> &[BlindedPath] {
+		$contents.request_paths()
 	}
 
 	/// Paths to the recipient for indicating that a held HTLC is available to claim when they next
@@ -398,7 +398,7 @@ impl InvoiceContents {
 		self.offer.issuer()
 	}
 
-	fn offer_message_paths(&self) -> &[BlindedPath] {
+	fn request_paths(&self) -> &[BlindedPath] {
 		self.offer.paths()
 	}
 
@@ -682,7 +682,7 @@ mod tests {
 		assert_eq!(invoice.description(), None);
 		assert_eq!(invoice.offer_features(), &OfferFeatures::empty());
 		assert_eq!(invoice.absolute_expiry(), None);
-		assert_eq!(invoice.offer_message_paths(), &[blinded_path()]);
+		assert_eq!(invoice.request_paths(), &[blinded_path()]);
 		assert_eq!(invoice.message_paths(), &[blinded_path()]);
 		assert_eq!(invoice.issuer(), None);
 		assert_eq!(invoice.supported_quantity(), Quantity::One);
@@ -1141,8 +1141,8 @@ mod tests {
 	#[test]
 	fn fails_parsing_invoice_with_invalid_offer_fields() {
 		// Error if the offer is missing paths.
-		let missing_offer_paths_invoice = invoice();
-		let mut tlv_stream = missing_offer_paths_invoice.as_tlv_stream();
+		let missing_request_paths_invoice = invoice();
+		let mut tlv_stream = missing_request_paths_invoice.as_tlv_stream();
 		tlv_stream.0.paths = None;
 		match StaticInvoice::try_from(tlv_stream_to_bytes(&tlv_stream)) {
 			Ok(_) => panic!("expected error"),