f - require payer metadata

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -798,30 +798,12 @@ mod tests {
 		assert_eq!(tlv_stream.payer_note, Some(&String::from("baz")));
 	}
 
-	#[test]
-	fn parses_invoice_request_with_metadata() {
-		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
-			.amount_msats(1000)
-			.build().unwrap()
-			.request_invoice(payer_pubkey())
-			.metadata(vec![42; 32])
-			.build().unwrap()
-			.sign(payer_sign).unwrap();
-
-		let mut buffer = Vec::new();
-		invoice_request.write(&mut buffer).unwrap();
-
-		if let Err(e) = InvoiceRequest::try_from(buffer) {
-			panic!("error parsing invoice_request: {:?}", e);
-		}
-	}
-
 	#[test]
 	fn parses_invoice_request_with_chain() {
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.chain(Network::Bitcoin)
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
@@ -836,7 +818,7 @@ mod tests {
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.chain(Network::Testnet)
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
@@ -855,7 +837,7 @@ mod tests {
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 
@@ -868,7 +850,7 @@ mod tests {
 
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
@@ -882,7 +864,7 @@ mod tests {
 
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
 
@@ -897,7 +879,7 @@ mod tests {
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(999)
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
@@ -913,7 +895,7 @@ mod tests {
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount(Amount::Currency { iso4217_code: *b"USD", amount: 1000 })
 			.build_unchecked()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
 
@@ -936,7 +918,7 @@ mod tests {
 			.amount_msats(1000)
 			.supported_quantity(Quantity::one())
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 
@@ -951,7 +933,7 @@ mod tests {
 			.amount_msats(1000)
 			.supported_quantity(Quantity::one())
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(2_000)
 			.quantity(2)
 			.build_unchecked()
@@ -971,7 +953,7 @@ mod tests {
 			.amount_msats(1000)
 			.supported_quantity(Quantity::Bounded(ten))
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(10_000)
 			.quantity(10)
 			.build().unwrap()
@@ -988,7 +970,7 @@ mod tests {
 			.amount_msats(1000)
 			.supported_quantity(Quantity::Bounded(ten))
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(11_000)
 			.quantity(11)
 			.build_unchecked()
@@ -1006,7 +988,7 @@ mod tests {
 			.amount_msats(1000)
 			.supported_quantity(Quantity::Unbounded)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(2_000)
 			.quantity(2)
 			.build().unwrap()
@@ -1023,7 +1005,7 @@ mod tests {
 			.amount_msats(1000)
 			.supported_quantity(Quantity::Unbounded)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
 
@@ -1037,25 +1019,33 @@ mod tests {
 	}
 
 	#[test]
-	fn parses_invoice_request_with_payer_id() {
-		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
+	fn fails_parsing_invoice_request_without_metadata() {
+		let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
-			.build().unwrap()
-			.request_invoice(payer_pubkey())
-			.build().unwrap()
-			.sign(payer_sign).unwrap();
+			.build().unwrap();
+		let mut unsigned_invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey())
+			.build().unwrap();
+		let mut tlv_stream = unsigned_invoice_request.invoice_request.as_tlv_stream();
+		tlv_stream.0.metadata = None;
 
 		let mut buffer = Vec::new();
-		invoice_request.write(&mut buffer).unwrap();
+		tlv_stream.write(&mut buffer).unwrap();
 
-		if let Err(e) = InvoiceRequest::try_from(buffer) {
-			panic!("error parsing invoice_request: {:?}", e);
+		match InvoiceRequest::try_from(buffer) {
+			Ok(_) => panic!("expected error"),
+			Err(e) => {
+				assert_eq!(e, ParseError::InvalidSemantics(SemanticError::MissingPayerMetadata));
+			},
 		}
+	}
 
+	#[test]
+	fn fails_parsing_invoice_request_without_payer_id() {
 		let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap();
-		let mut unsigned_invoice_request = offer.request_invoice(payer_pubkey()).build().unwrap();
+		let mut unsigned_invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey())
+			.build().unwrap();
 		let mut tlv_stream = unsigned_invoice_request.invoice_request.as_tlv_stream();
 		tlv_stream.2.payer_id = None;
 
@@ -1069,11 +1059,12 @@ mod tests {
 	}
 
 	#[test]
-	fn fails_parsing_invoice_request_with_missing_node_id() {
+	fn fails_parsing_invoice_request_without_node_id() {
 		let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap();
-		let mut unsigned_invoice_request = offer.request_invoice(payer_pubkey()).build().unwrap();
+		let mut unsigned_invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey())
+			.build().unwrap();
 		let mut tlv_stream = unsigned_invoice_request.invoice_request.as_tlv_stream();
 		tlv_stream.1.node_id = None;
 
@@ -1093,7 +1084,7 @@ mod tests {
 		let mut invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
 			.build().unwrap()
-			.request_invoice(payer_pubkey())
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let last_signature_byte = invoice_request.bytes.last_mut().unwrap();