f rename tlv stream ref

Author: valentinewallace

lightning/src/offers/invoice.rs

@@ -1102,7 +1102,7 @@ impl InvoiceFields {
 			fallbacks: self.fallbacks.as_ref(),
 			features,
 			node_id: Some(&self.signing_pubkey),
-			async_receive_message_paths: None,
+			invoice_message_paths: None,
 		}
 	}
 }
@@ -1171,7 +1171,7 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
 	(174, features: (Bolt12InvoiceFeatures, WithoutLength)),
 	(176, node_id: PublicKey),
 	// Only present in `StaticInvoice`s.
-	(238, async_receive_message_paths: (Vec<BlindedPath>, WithoutLength)),
+	(238, invoice_message_paths: (Vec<BlindedPath>, WithoutLength)),
 });
 
 pub(super) type BlindedPathIter<'a> = core::iter::Map<
@@ -1309,11 +1309,11 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 			invoice_request_tlv_stream,
 			InvoiceTlvStream {
 				paths, blindedpay, created_at, relative_expiry, payment_hash, amount, fallbacks,
-				features, node_id, async_receive_message_paths,
+				features, node_id, invoice_message_paths,
 			},
 		) = tlv_stream;
 
-		if async_receive_message_paths.is_some() { return Err(Bolt12SemanticError::UnexpectedPaths) }
+		if invoice_message_paths.is_some() { return Err(Bolt12SemanticError::UnexpectedPaths) }
 
 		let payment_paths = construct_payment_paths(blindedpay, paths)?;
 
@@ -1580,7 +1580,7 @@ mod tests {
 					fallbacks: None,
 					features: None,
 					node_id: Some(&recipient_pubkey()),
-					async_receive_message_paths: None,
+					invoice_message_paths: None,
 				},
 				SignatureTlvStreamRef { signature: Some(&invoice.signature()) },
 			),
@@ -1672,7 +1672,7 @@ mod tests {
 					fallbacks: None,
 					features: None,
 					node_id: Some(&recipient_pubkey()),
-					async_receive_message_paths: None,
+					invoice_message_paths: None,
 				},
 				SignatureTlvStreamRef { signature: Some(&invoice.signature()) },
 			),
@@ -2445,7 +2445,7 @@ mod tests {
 	}
 
 	#[test]
-	fn fails_parsing_invoice_with_async_receive_message_paths() {
+	fn fails_parsing_invoice_with_invoice_message_paths() {
 		let invoice = OfferBuilder::new(recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
@@ -2466,8 +2466,8 @@ mod tests {
 		};
 
 		let mut tlv_stream = invoice.as_tlv_stream();
-		let async_receive_message_paths = vec![blinded_path];
-		tlv_stream.3.async_receive_message_paths = Some(&async_receive_message_paths);
+		let invoice_message_paths = vec![blinded_path];
+		tlv_stream.3.invoice_message_paths = Some(&invoice_message_paths);
 
 		match Bolt12Invoice::try_from(tlv_stream.to_bytes()) {
 			Ok(_) => panic!("expected error"),

lightning/src/offers/static_invoice.rs

@@ -361,7 +361,7 @@ impl InvoiceContents {
 
 		let invoice = InvoiceTlvStreamRef {
 			paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
-			async_receive_message_paths: Some(self.async_receive_message_paths.as_ref()),
+			invoice_message_paths: Some(self.async_receive_message_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),
@@ -519,7 +519,7 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 				fallbacks,
 				features,
 				node_id,
-				async_receive_message_paths,
+				invoice_message_paths,
 				payment_hash,
 				amount,
 			},
@@ -534,7 +534,7 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 
 		let payment_paths = construct_payment_paths(blindedpay, paths)?;
 		let async_receive_message_paths =
-			async_receive_message_paths.ok_or(Bolt12SemanticError::MissingPaths)?;
+			invoice_message_paths.ok_or(Bolt12SemanticError::MissingPaths)?;
 
 		let created_at = match created_at {
 			None => return Err(Bolt12SemanticError::MissingCreationTime),
@@ -736,7 +736,7 @@ mod tests {
 					fallbacks: None,
 					features: None,
 					node_id: Some(&offer_signing_pubkey),
-					async_receive_message_paths: Some(&paths),
+					invoice_message_paths: Some(&paths),
 				},
 				SignatureTlvStreamRef { signature: Some(&invoice.signature()) },
 			)
@@ -1067,7 +1067,7 @@ 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();
-		tlv_stream.1.async_receive_message_paths = None;
+		tlv_stream.1.invoice_message_paths = None;
 		match StaticInvoice::try_from(tlv_stream_to_bytes(&tlv_stream)) {
 			Ok(_) => panic!("expected error"),
 			Err(e) => {