Skip to content

Commit f80f449

Browse files
jkczyzjkczyz
committed
f - require payer metadata
1 parent 856030c commit f80f449

File tree

1 file changed

+22
-46
lines changed

1 file changed

+22
-46
lines changed

‎lightning/src/offers/invoice_request.rs

Lines changed: 22 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ mod tests {
499499
let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
500500
.amount_msats(1000)
501501
.build().unwrap();
502-
let invoice_request = offer.request_invoice(payer_pubkey())
502+
let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey())
503503
.build().unwrap().sign(payer_sign).unwrap();
504504

505505
let (payer_tlv_stream, offer_tlv_stream, invoice_request_tlv_stream, signature_tlv_stream) =
@@ -508,7 +508,7 @@ mod tests {
508508
invoice_request.write(&mut buffer).unwrap();
509509

510510
assert_eq!(invoice_request.bytes, buffer.as_slice());
511-
assert_eq!(invoice_request.metadata(), None);
511+
assert_eq!(invoice_request.metadata(), &[1; 32]);
512512
assert_eq!(invoice_request.chain(), ChainHash::using_genesis_block(Network::Bitcoin));
513513
assert_eq!(invoice_request.amount_msats(), None);
514514
assert_eq!(invoice_request.features(), &InvoiceRequestFeatures::empty());
@@ -517,7 +517,7 @@ mod tests {
517517
assert_eq!(invoice_request.payer_note(), None);
518518
assert!(invoice_request.signature().is_some());
519519

520-
assert_eq!(payer_tlv_stream.metadata, None);
520+
assert_eq!(payer_tlv_stream.metadata, Some(&vec![1; 32]));
521521
assert_eq!(offer_tlv_stream.chains, None);
522522
assert_eq!(offer_tlv_stream.metadata, None);
523523
assert_eq!(offer_tlv_stream.currency, None);
@@ -542,30 +542,6 @@ mod tests {
542542
}
543543
}
544544

545-
#[test]
546-
fn builds_invoice_request_with_metadata() {
547-
let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
548-
.amount_msats(1000)
549-
.build().unwrap();
550-
551-
let invoice_request = offer.request_invoice(payer_pubkey())
552-
.metadata(vec![42; 32])
553-
.build().unwrap()
554-
.sign(payer_sign).unwrap();
555-
let (tlv_stream, _, _, _) = invoice_request.as_tlv_stream();
556-
assert_eq!(invoice_request.metadata(), Some(&vec![42; 32]));
557-
assert_eq!(tlv_stream.metadata, Some(&vec![42; 32]));
558-
559-
let invoice_request = offer.request_invoice(payer_pubkey())
560-
.metadata(vec![42; 32])
561-
.metadata(vec![43; 32])
562-
.build().unwrap()
563-
.sign(payer_sign).unwrap();
564-
let (tlv_stream, _, _, _) = invoice_request.as_tlv_stream();
565-
assert_eq!(invoice_request.metadata(), Some(&vec![43; 32]));
566-
assert_eq!(tlv_stream.metadata, Some(&vec![43; 32]));
567-
}
568-
569545
#[test]
570546
fn builds_invoice_request_with_chain() {
571547
let mainnet = ChainHash::using_genesis_block(Network::Bitcoin);
@@ -574,7 +550,7 @@ mod tests {
574550
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
575551
.amount_msats(1000)
576552
.build().unwrap()
577-
.request_invoice(payer_pubkey())
553+
.request_invoice(vec![1; 32], payer_pubkey())
578554
.chain(Network::Bitcoin)
579555
.build().unwrap()
580556
.sign(payer_sign).unwrap();
@@ -586,7 +562,7 @@ mod tests {
586562
.amount_msats(1000)
587563
.chain(Network::Testnet)
588564
.build().unwrap()
589-
.request_invoice(payer_pubkey())
565+
.request_invoice(vec![1; 32], payer_pubkey())
590566
.chain(Network::Testnet)
591567
.build().unwrap()
592568
.sign(payer_sign).unwrap();
@@ -599,7 +575,7 @@ mod tests {
599575
.chain(Network::Bitcoin)
600576
.chain(Network::Testnet)
601577
.build().unwrap()
602-
.request_invoice(payer_pubkey())
578+
.request_invoice(vec![1; 32], payer_pubkey())
603579
.chain(Network::Bitcoin)
604580
.build().unwrap()
605581
.sign(payer_sign).unwrap();
@@ -611,7 +587,7 @@ mod tests {
611587
.amount_msats(1000)
612588
.chain(Network::Testnet)
613589
.build().unwrap()
614-
.request_invoice(payer_pubkey())
590+
.request_invoice(vec![1; 32], payer_pubkey())
615591
.chain(Network::Bitcoin)
616592
.chain(Network::Testnet)
617593
.build().unwrap()
@@ -624,7 +600,7 @@ mod tests {
624600
.amount_msats(1000)
625601
.chain(Network::Testnet)
626602
.build().unwrap()
627-
.request_invoice(payer_pubkey())
603+
.request_invoice(vec![1; 32], payer_pubkey())
628604
.chain(Network::Bitcoin)
629605
.build()
630606
{
@@ -638,7 +614,7 @@ mod tests {
638614
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
639615
.amount_msats(1000)
640616
.build().unwrap()
641-
.request_invoice(payer_pubkey())
617+
.request_invoice(vec![1; 32], payer_pubkey())
642618
.amount_msats(1000)
643619
.build().unwrap()
644620
.sign(payer_sign).unwrap();
@@ -649,7 +625,7 @@ mod tests {
649625
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
650626
.amount_msats(1000)
651627
.build().unwrap()
652-
.request_invoice(payer_pubkey())
628+
.request_invoice(vec![1; 32], payer_pubkey())
653629
.amount_msats(999)
654630
.amount_msats(1000)
655631
.build().unwrap()
@@ -661,7 +637,7 @@ mod tests {
661637
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
662638
.amount_msats(1000)
663639
.build().unwrap()
664-
.request_invoice(payer_pubkey())
640+
.request_invoice(vec![1; 32], payer_pubkey())
665641
.amount_msats(1001)
666642
.build().unwrap()
667643
.sign(payer_sign).unwrap();
@@ -672,7 +648,7 @@ mod tests {
672648
match OfferBuilder::new("foo".into(), recipient_pubkey())
673649
.amount_msats(1000)
674650
.build().unwrap()
675-
.request_invoice(payer_pubkey())
651+
.request_invoice(vec![1; 32], payer_pubkey())
676652
.amount_msats(999)
677653
.build()
678654
{
@@ -684,7 +660,7 @@ mod tests {
684660
.amount_msats(1000)
685661
.supported_quantity(Quantity::Unbounded)
686662
.build().unwrap()
687-
.request_invoice(payer_pubkey())
663+
.request_invoice(vec![1; 32], payer_pubkey())
688664
.amount_msats(1000)
689665
.quantity(2)
690666
.build()
@@ -695,7 +671,7 @@ mod tests {
695671

696672
match OfferBuilder::new("foo".into(), recipient_pubkey())
697673
.build().unwrap()
698-
.request_invoice(payer_pubkey())
674+
.request_invoice(vec![1; 32], payer_pubkey())
699675
.build()
700676
{
701677
Ok(_) => panic!("expected error"),
@@ -711,7 +687,7 @@ mod tests {
711687
.amount_msats(1000)
712688
.supported_quantity(Quantity::one())
713689
.build().unwrap()
714-
.request_invoice(payer_pubkey())
690+
.request_invoice(vec![1; 32], payer_pubkey())
715691
.build().unwrap()
716692
.sign(payer_sign).unwrap();
717693
let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -722,7 +698,7 @@ mod tests {
722698
.amount_msats(1000)
723699
.supported_quantity(Quantity::one())
724700
.build().unwrap()
725-
.request_invoice(payer_pubkey())
701+
.request_invoice(vec![1; 32], payer_pubkey())
726702
.amount_msats(2_000)
727703
.quantity(2)
728704
.build()
@@ -735,7 +711,7 @@ mod tests {
735711
.amount_msats(1000)
736712
.supported_quantity(Quantity::Bounded(ten))
737713
.build().unwrap()
738-
.request_invoice(payer_pubkey())
714+
.request_invoice(vec![1; 32], payer_pubkey())
739715
.amount_msats(10_000)
740716
.quantity(10)
741717
.build().unwrap()
@@ -748,7 +724,7 @@ mod tests {
748724
.amount_msats(1000)
749725
.supported_quantity(Quantity::Bounded(ten))
750726
.build().unwrap()
751-
.request_invoice(payer_pubkey())
727+
.request_invoice(vec![1; 32], payer_pubkey())
752728
.amount_msats(11_000)
753729
.quantity(11)
754730
.build()
@@ -761,7 +737,7 @@ mod tests {
761737
.amount_msats(1000)
762738
.supported_quantity(Quantity::Unbounded)
763739
.build().unwrap()
764-
.request_invoice(payer_pubkey())
740+
.request_invoice(vec![1; 32], payer_pubkey())
765741
.amount_msats(2_000)
766742
.quantity(2)
767743
.build().unwrap()
@@ -774,7 +750,7 @@ mod tests {
774750
.amount_msats(1000)
775751
.supported_quantity(Quantity::Unbounded)
776752
.build().unwrap()
777-
.request_invoice(payer_pubkey())
753+
.request_invoice(vec![1; 32], payer_pubkey())
778754
.build()
779755
{
780756
Ok(_) => panic!("expected error"),
@@ -787,7 +763,7 @@ mod tests {
787763
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
788764
.amount_msats(1000)
789765
.build().unwrap()
790-
.request_invoice(payer_pubkey())
766+
.request_invoice(vec![1; 32], payer_pubkey())
791767
.payer_note("bar".into())
792768
.build().unwrap()
793769
.sign(payer_sign).unwrap();
@@ -798,7 +774,7 @@ mod tests {
798774
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
799775
.amount_msats(1000)
800776
.build().unwrap()
801-
.request_invoice(payer_pubkey())
777+
.request_invoice(vec![1; 32], payer_pubkey())
802778
.payer_note("bar".into())
803779
.payer_note("baz".into())
804780
.build().unwrap()

0 commit comments

Comments
 (0)