Skip to content

Commit e3da832

Browse files
jkczyzjkczyz
committed
f - require payer metadata
1 parent 12f7bc3 commit e3da832

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
@@ -495,7 +495,7 @@ mod tests {
495495
let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
496496
.amount_msats(1000)
497497
.build().unwrap();
498-
let invoice_request = offer.request_invoice(payer_pubkey())
498+
let invoice_request = offer.request_invoice(vec![1; 32], payer_pubkey())
499499
.build().unwrap().sign(payer_sign).unwrap();
500500

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

506506
assert_eq!(invoice_request.bytes, buffer.as_slice());
507-
assert_eq!(invoice_request.metadata(), None);
507+
assert_eq!(invoice_request.metadata(), &[1; 32]);
508508
assert_eq!(invoice_request.chain(), ChainHash::using_genesis_block(Network::Bitcoin));
509509
assert_eq!(invoice_request.amount_msats(), None);
510510
assert_eq!(invoice_request.features(), &InvoiceRequestFeatures::empty());
@@ -513,7 +513,7 @@ mod tests {
513513
assert_eq!(invoice_request.payer_note(), None);
514514
assert!(invoice_request.signature().is_some());
515515

516-
assert_eq!(payer_tlv_stream.metadata, None);
516+
assert_eq!(payer_tlv_stream.metadata, Some(&vec![1; 32]));
517517
assert_eq!(offer_tlv_stream.chains, None);
518518
assert_eq!(offer_tlv_stream.metadata, None);
519519
assert_eq!(offer_tlv_stream.currency, None);
@@ -538,30 +538,6 @@ mod tests {
538538
}
539539
}
540540

541-
#[test]
542-
fn builds_invoice_request_with_metadata() {
543-
let offer = OfferBuilder::new("foo".into(), recipient_pubkey())
544-
.amount_msats(1000)
545-
.build().unwrap();
546-
547-
let invoice_request = offer.request_invoice(payer_pubkey())
548-
.metadata(vec![42; 32])
549-
.build().unwrap()
550-
.sign(payer_sign).unwrap();
551-
let (tlv_stream, _, _, _) = invoice_request.as_tlv_stream();
552-
assert_eq!(invoice_request.metadata(), Some(&vec![42; 32]));
553-
assert_eq!(tlv_stream.metadata, Some(&vec![42; 32]));
554-
555-
let invoice_request = offer.request_invoice(payer_pubkey())
556-
.metadata(vec![42; 32])
557-
.metadata(vec![43; 32])
558-
.build().unwrap()
559-
.sign(payer_sign).unwrap();
560-
let (tlv_stream, _, _, _) = invoice_request.as_tlv_stream();
561-
assert_eq!(invoice_request.metadata(), Some(&vec![43; 32]));
562-
assert_eq!(tlv_stream.metadata, Some(&vec![43; 32]));
563-
}
564-
565541
#[test]
566542
fn builds_invoice_request_with_chain() {
567543
let mainnet = ChainHash::using_genesis_block(Network::Bitcoin);
@@ -570,7 +546,7 @@ mod tests {
570546
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
571547
.amount_msats(1000)
572548
.build().unwrap()
573-
.request_invoice(payer_pubkey())
549+
.request_invoice(vec![1; 32], payer_pubkey())
574550
.chain(Network::Bitcoin)
575551
.build().unwrap()
576552
.sign(payer_sign).unwrap();
@@ -582,7 +558,7 @@ mod tests {
582558
.amount_msats(1000)
583559
.chain(Network::Testnet)
584560
.build().unwrap()
585-
.request_invoice(payer_pubkey())
561+
.request_invoice(vec![1; 32], payer_pubkey())
586562
.chain(Network::Testnet)
587563
.build().unwrap()
588564
.sign(payer_sign).unwrap();
@@ -595,7 +571,7 @@ mod tests {
595571
.chain(Network::Bitcoin)
596572
.chain(Network::Testnet)
597573
.build().unwrap()
598-
.request_invoice(payer_pubkey())
574+
.request_invoice(vec![1; 32], payer_pubkey())
599575
.chain(Network::Bitcoin)
600576
.build().unwrap()
601577
.sign(payer_sign).unwrap();
@@ -607,7 +583,7 @@ mod tests {
607583
.amount_msats(1000)
608584
.chain(Network::Testnet)
609585
.build().unwrap()
610-
.request_invoice(payer_pubkey())
586+
.request_invoice(vec![1; 32], payer_pubkey())
611587
.chain(Network::Bitcoin)
612588
.chain(Network::Testnet)
613589
.build().unwrap()
@@ -620,7 +596,7 @@ mod tests {
620596
.amount_msats(1000)
621597
.chain(Network::Testnet)
622598
.build().unwrap()
623-
.request_invoice(payer_pubkey())
599+
.request_invoice(vec![1; 32], payer_pubkey())
624600
.chain(Network::Bitcoin)
625601
.build()
626602
{
@@ -634,7 +610,7 @@ mod tests {
634610
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
635611
.amount_msats(1000)
636612
.build().unwrap()
637-
.request_invoice(payer_pubkey())
613+
.request_invoice(vec![1; 32], payer_pubkey())
638614
.amount_msats(1000)
639615
.build().unwrap()
640616
.sign(payer_sign).unwrap();
@@ -645,7 +621,7 @@ mod tests {
645621
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
646622
.amount_msats(1000)
647623
.build().unwrap()
648-
.request_invoice(payer_pubkey())
624+
.request_invoice(vec![1; 32], payer_pubkey())
649625
.amount_msats(999)
650626
.amount_msats(1000)
651627
.build().unwrap()
@@ -657,7 +633,7 @@ mod tests {
657633
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
658634
.amount_msats(1000)
659635
.build().unwrap()
660-
.request_invoice(payer_pubkey())
636+
.request_invoice(vec![1; 32], payer_pubkey())
661637
.amount_msats(1001)
662638
.build().unwrap()
663639
.sign(payer_sign).unwrap();
@@ -668,7 +644,7 @@ mod tests {
668644
match OfferBuilder::new("foo".into(), recipient_pubkey())
669645
.amount_msats(1000)
670646
.build().unwrap()
671-
.request_invoice(payer_pubkey())
647+
.request_invoice(vec![1; 32], payer_pubkey())
672648
.amount_msats(999)
673649
.build()
674650
{
@@ -680,7 +656,7 @@ mod tests {
680656
.amount_msats(1000)
681657
.supported_quantity(Quantity::Unbounded)
682658
.build().unwrap()
683-
.request_invoice(payer_pubkey())
659+
.request_invoice(vec![1; 32], payer_pubkey())
684660
.amount_msats(1000)
685661
.quantity(2)
686662
.build()
@@ -691,7 +667,7 @@ mod tests {
691667

692668
match OfferBuilder::new("foo".into(), recipient_pubkey())
693669
.build().unwrap()
694-
.request_invoice(payer_pubkey())
670+
.request_invoice(vec![1; 32], payer_pubkey())
695671
.build()
696672
{
697673
Ok(_) => panic!("expected error"),
@@ -707,7 +683,7 @@ mod tests {
707683
.amount_msats(1000)
708684
.supported_quantity(Quantity::one())
709685
.build().unwrap()
710-
.request_invoice(payer_pubkey())
686+
.request_invoice(vec![1; 32], payer_pubkey())
711687
.build().unwrap()
712688
.sign(payer_sign).unwrap();
713689
let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -718,7 +694,7 @@ mod tests {
718694
.amount_msats(1000)
719695
.supported_quantity(Quantity::one())
720696
.build().unwrap()
721-
.request_invoice(payer_pubkey())
697+
.request_invoice(vec![1; 32], payer_pubkey())
722698
.amount_msats(2_000)
723699
.quantity(2)
724700
.build()
@@ -731,7 +707,7 @@ mod tests {
731707
.amount_msats(1000)
732708
.supported_quantity(Quantity::Bounded(ten))
733709
.build().unwrap()
734-
.request_invoice(payer_pubkey())
710+
.request_invoice(vec![1; 32], payer_pubkey())
735711
.amount_msats(10_000)
736712
.quantity(10)
737713
.build().unwrap()
@@ -744,7 +720,7 @@ mod tests {
744720
.amount_msats(1000)
745721
.supported_quantity(Quantity::Bounded(ten))
746722
.build().unwrap()
747-
.request_invoice(payer_pubkey())
723+
.request_invoice(vec![1; 32], payer_pubkey())
748724
.amount_msats(11_000)
749725
.quantity(11)
750726
.build()
@@ -757,7 +733,7 @@ mod tests {
757733
.amount_msats(1000)
758734
.supported_quantity(Quantity::Unbounded)
759735
.build().unwrap()
760-
.request_invoice(payer_pubkey())
736+
.request_invoice(vec![1; 32], payer_pubkey())
761737
.amount_msats(2_000)
762738
.quantity(2)
763739
.build().unwrap()
@@ -770,7 +746,7 @@ mod tests {
770746
.amount_msats(1000)
771747
.supported_quantity(Quantity::Unbounded)
772748
.build().unwrap()
773-
.request_invoice(payer_pubkey())
749+
.request_invoice(vec![1; 32], payer_pubkey())
774750
.build()
775751
{
776752
Ok(_) => panic!("expected error"),
@@ -783,7 +759,7 @@ mod tests {
783759
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
784760
.amount_msats(1000)
785761
.build().unwrap()
786-
.request_invoice(payer_pubkey())
762+
.request_invoice(vec![1; 32], payer_pubkey())
787763
.payer_note("bar".into())
788764
.build().unwrap()
789765
.sign(payer_sign).unwrap();
@@ -794,7 +770,7 @@ mod tests {
794770
let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
795771
.amount_msats(1000)
796772
.build().unwrap()
797-
.request_invoice(payer_pubkey())
773+
.request_invoice(vec![1; 32], payer_pubkey())
798774
.payer_note("bar".into())
799775
.payer_note("baz".into())
800776
.build().unwrap()

0 commit comments

Comments
 (0)