f remove message from name

Author: valentinewallace

lightning/src/offers/static_invoice.rs

@@ -77,7 +77,7 @@ struct InvoiceContents {
 	fallbacks: Option<Vec<FallbackAddress>>,
 	features: Bolt12InvoiceFeatures,
 	signing_pubkey: PublicKey,
-	async_receive_message_paths: Vec<BlindedPath>,
+	async_receive_paths: Vec<BlindedPath>,
 }
 
 /// Builds a [`StaticInvoice`] from an [`Offer`].
@@ -98,17 +98,14 @@ impl<'a> StaticInvoiceBuilder<'a> {
 	/// after `created_at`.
 	pub fn for_offer_using_derived_keys<T: secp256k1::Signing>(
 		offer: &'a Offer, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
-		async_receive_message_paths: Vec<BlindedPath>, created_at: Duration,
-		expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>,
+		async_receive_paths: Vec<BlindedPath>, created_at: Duration, expanded_key: &ExpandedKey,
+		secp_ctx: &Secp256k1<T>,
 	) -> Result<Self, Bolt12SemanticError> {
 		if offer.chains().len() > 1 {
 			return Err(Bolt12SemanticError::UnexpectedChain);
 		}
 
-		if payment_paths.is_empty()
-			|| async_receive_message_paths.is_empty()
-			|| offer.paths().is_empty()
-		{
+		if payment_paths.is_empty() || async_receive_paths.is_empty() || offer.paths().is_empty() {
 			return Err(Bolt12SemanticError::MissingPaths);
 		}
 
@@ -129,7 +126,7 @@ impl<'a> StaticInvoiceBuilder<'a> {
 		let invoice = InvoiceContents::new(
 			offer,
 			payment_paths,
-			async_receive_message_paths,
+			async_receive_paths,
 			created_at,
 			signing_pubkey,
 		);
@@ -238,8 +235,8 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 
 	/// Paths to the recipient for indicating that a held HTLC is available to claim when they next
 	/// come online.
-	pub fn async_receive_message_paths(&$self) -> &[BlindedPath] {
-		$contents.async_receive_message_paths()
+	pub fn async_receive_paths(&$self) -> &[BlindedPath] {
+		$contents.async_receive_paths()
 	}
 
 	/// The quantity of items supported, from [`Offer::supported_quantity`].
@@ -335,13 +332,12 @@ impl InvoiceContents {
 
 	fn new(
 		offer: &Offer, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
-		async_receive_message_paths: Vec<BlindedPath>, created_at: Duration,
-		signing_pubkey: PublicKey,
+		async_receive_paths: Vec<BlindedPath>, created_at: Duration, signing_pubkey: PublicKey,
 	) -> Self {
 		Self {
 			offer: offer.contents.clone(),
 			payment_paths,
-			async_receive_message_paths,
+			async_receive_paths,
 			created_at,
 			relative_expiry: None,
 			fallbacks: None,
@@ -361,7 +357,7 @@ impl InvoiceContents {
 
 		let invoice = InvoiceTlvStreamRef {
 			paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
-			invoice_message_paths: Some(self.async_receive_message_paths.as_ref()),
+			invoice_message_paths: Some(self.async_receive_paths.as_ref()),
 			blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 			created_at: Some(self.created_at.as_secs()),
 			relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
@@ -408,8 +404,8 @@ impl InvoiceContents {
 		self.offer.paths()
 	}
 
-	fn async_receive_message_paths(&self) -> &[BlindedPath] {
-		&self.async_receive_message_paths[..]
+	fn async_receive_paths(&self) -> &[BlindedPath] {
+		&self.async_receive_paths[..]
 	}
 
 	fn supported_quantity(&self) -> Quantity {
@@ -533,8 +529,7 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 		}
 
 		let payment_paths = construct_payment_paths(blindedpay, paths)?;
-		let async_receive_message_paths =
-			invoice_message_paths.ok_or(Bolt12SemanticError::MissingPaths)?;
+		let async_receive_paths = invoice_message_paths.ok_or(Bolt12SemanticError::MissingPaths)?;
 
 		let created_at = match created_at {
 			None => return Err(Bolt12SemanticError::MissingCreationTime),
@@ -558,7 +553,7 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 		Ok(InvoiceContents {
 			offer: OfferContents::try_from(offer_tlv_stream)?,
 			payment_paths,
-			async_receive_message_paths,
+			async_receive_paths,
 			created_at,
 			relative_expiry,
 			fallbacks,
@@ -689,7 +684,7 @@ mod tests {
 		assert_eq!(invoice.offer_features(), &OfferFeatures::empty());
 		assert_eq!(invoice.absolute_expiry(), None);
 		assert_eq!(invoice.request_paths(), &[blinded_path()]);
-		assert_eq!(invoice.async_receive_message_paths(), &[blinded_path()]);
+		assert_eq!(invoice.async_receive_paths(), &[blinded_path()]);
 		assert_eq!(invoice.issuer(), None);
 		assert_eq!(invoice.supported_quantity(), Quantity::One);
 		assert_ne!(invoice.signing_pubkey(), recipient_pubkey());
@@ -1065,8 +1060,8 @@ mod tests {
 		}
 
 		// Error if message paths are missing.
-		let missing_async_receive_message_paths_invoice = invoice();
-		let mut tlv_stream = missing_async_receive_message_paths_invoice.as_tlv_stream();
+		let missing_async_receive_paths_invoice = invoice();
+		let mut tlv_stream = missing_async_receive_paths_invoice.as_tlv_stream();
 		tlv_stream.1.invoice_message_paths = None;
 		match StaticInvoice::try_from(tlv_stream_to_bytes(&tlv_stream)) {
 			Ok(_) => panic!("expected error"),