f sanity check invoice tlv stream

Author: valentinewallace

lightning/src/offers/static_invoice.rs

@@ -565,22 +565,33 @@ mod tests {
 	use crate::blinded_path::{BlindedHop, BlindedPath, IntroductionNode};
 	use crate::ln::features::{Bolt12InvoiceFeatures, OfferFeatures};
 	use crate::ln::inbound_payment::ExpandedKey;
-	use crate::offers::invoice::SIGNATURE_TAG;
+	use crate::offers::invoice::{InvoiceTlvStreamRef, SIGNATURE_TAG};
 	use crate::offers::merkle;
-	use crate::offers::merkle::TaggedHash;
-	use crate::offers::offer::{Offer, OfferBuilder, Quantity};
+	use crate::offers::merkle::{SignatureTlvStreamRef, TaggedHash};
+	use crate::offers::offer::{Offer, OfferBuilder, OfferTlvStreamRef, Quantity};
 	use crate::offers::parse::Bolt12SemanticError;
 	use crate::offers::static_invoice::{
 		StaticInvoice, StaticInvoiceBuilder, DEFAULT_RELATIVE_EXPIRY,
 	};
 	use crate::offers::test_utils::*;
 	use crate::sign::KeyMaterial;
-	use crate::util::ser::Writeable;
+	use crate::util::ser::{Iterable, Writeable};
 	use bitcoin::blockdata::constants::ChainHash;
 	use bitcoin::secp256k1::Secp256k1;
 	use bitcoin::Network;
 	use core::time::Duration;
 
+	impl StaticInvoice {
+		fn as_tlv_stream(&self) -> (OfferTlvStreamRef, InvoiceTlvStreamRef, SignatureTlvStreamRef) {
+			let (offer_tlv_stream, invoice_tlv_stream) = self.contents.as_tlv_stream();
+			(
+				offer_tlv_stream,
+				invoice_tlv_stream,
+				SignatureTlvStreamRef { signature: Some(&self.signature) },
+			)
+		}
+	}
+
 	fn blinded_path() -> BlindedPath {
 		BlindedPath {
 			introduction_node: IntroductionNode::NodeId(pubkey(40)),
@@ -642,14 +653,43 @@ mod tests {
 		assert!(invoice.fallbacks().is_empty());
 		assert_eq!(invoice.invoice_features(), &Bolt12InvoiceFeatures::empty());
 
-		let keys_opt = offer.verify(&expanded_key, &secp_ctx).unwrap().1;
+		let keys = offer.verify(&expanded_key, &secp_ctx).unwrap().1.unwrap();
 		let message = TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &invoice.bytes);
-		assert!(merkle::verify_signature(
-			&invoice.signature,
-			&message,
-			keys_opt.unwrap().public_key()
-		)
-		.is_ok());
+		assert!(merkle::verify_signature(&invoice.signature, &message, keys.public_key()).is_ok());
+
+		let paths = vec![blinded_path()];
+		let metadata = vec![42; 16];
+		assert_eq!(
+			invoice.as_tlv_stream(),
+			(
+				OfferTlvStreamRef {
+					chains: None,
+					metadata: Some(&metadata),
+					currency: None,
+					amount: None,
+					description: None,
+					features: None,
+					absolute_expiry: None,
+					paths: Some(&paths),
+					issuer: None,
+					quantity_max: None,
+					node_id: Some(&keys.public_key()),
+				},
+				InvoiceTlvStreamRef {
+					paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
+					blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
+					created_at: Some(now.as_secs()),
+					relative_expiry: None,
+					payment_hash: None,
+					amount: None,
+					fallbacks: None,
+					features: None,
+					node_id: Some(&keys.public_key()),
+					message_paths: Some(&paths),
+				},
+				SignatureTlvStreamRef { signature: Some(&invoice.signature()) },
+			)
+		);
 
 		if let Err(e) = StaticInvoice::try_from(buffer) {
 			panic!("error parsing invoice: {:?}", e);