f make as_tlv_stream consistent w Bolt12Invoice

Author: valentinewallace

lightning/src/offers/static_invoice.rs

@@ -23,7 +23,9 @@ use crate::offers::invoice_macros::{invoice_accessors_common, invoice_builder_me
 use crate::offers::merkle::{
 	self, SignError, SignFn, SignatureTlvStream, SignatureTlvStreamRef, TaggedHash,
 };
-use crate::offers::offer::{Amount, Offer, OfferContents, OfferTlvStream, Quantity};
+use crate::offers::offer::{
+	Amount, Offer, OfferContents, OfferTlvStream, OfferTlvStreamRef, Quantity,
+};
 use crate::offers::parse::{Bolt12ParseError, Bolt12SemanticError, ParsedMessage};
 use crate::util::ser::{
 	HighZeroBytesDroppedBigSize, Iterable, SeekReadable, WithoutLength, Writeable, Writer,
@@ -243,11 +245,15 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 
 impl UnsignedStaticInvoice {
 	fn new(offer_bytes: &Vec<u8>, contents: InvoiceContents) -> Self {
+		let (_, invoice_tlv_stream) = contents.as_tlv_stream();
+		let offer_bytes = WithoutLength(offer_bytes);
+		let unsigned_tlv_stream = (offer_bytes, invoice_tlv_stream);
+
 		let mut bytes = Vec::new();
-		WithoutLength(offer_bytes).write(&mut bytes).unwrap();
-		contents.as_invoice_fields_tlv_stream().write(&mut bytes).unwrap();
+		unsigned_tlv_stream.write(&mut bytes).unwrap();
 
 		let tagged_hash = TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &bytes);
+
 		Self { contents, tagged_hash, bytes }
 	}
 
@@ -336,7 +342,7 @@ impl InvoiceContents {
 		}
 	}
 
-	fn as_invoice_fields_tlv_stream(&self) -> InvoiceTlvStreamRef {
+	fn as_tlv_stream(&self) -> PartialInvoiceTlvStreamRef {
 		let features = {
 			if self.features == Bolt12InvoiceFeatures::empty() {
 				None
@@ -345,7 +351,7 @@ impl InvoiceContents {
 			}
 		};
 
-		InvoiceTlvStreamRef {
+		let invoice = InvoiceTlvStreamRef {
 			paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 			message_paths: Some(self.message_paths.as_ref()),
 			blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
@@ -356,7 +362,9 @@ impl InvoiceContents {
 			node_id: Some(&self.signing_pubkey),
 			amount: None,
 			payment_hash: None,
-		}
+		};
+
+		(self.offer.as_tlv_stream(), invoice)
 	}
 
 	fn chain(&self) -> ChainHash {
@@ -464,6 +472,8 @@ impl SeekReadable for FullInvoiceTlvStream {
 
 type PartialInvoiceTlvStream = (OfferTlvStream, InvoiceTlvStream);
 
+type PartialInvoiceTlvStreamRef<'a> = (OfferTlvStreamRef<'a>, InvoiceTlvStreamRef<'a>);
+
 impl TryFrom<ParsedMessage<FullInvoiceTlvStream>> for StaticInvoice {
 	type Error = Bolt12ParseError;