Skip to content

Commit ead4645

Browse files
committed
f - update tests for invreq fields
1 parent b9b7e1a commit ead4645

File tree

1 file changed

+37
-4
lines changed

1 file changed

+37
-4
lines changed

lightning/src/ln/offers_tests.rs

+37-4
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ use crate::blinded_path::BlindedPath;
4646
use crate::blinded_path::payment::PaymentContext;
4747
use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
4848
use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
49+
use crate::ln::features::InvoiceRequestFeatures;
4950
use crate::ln::functional_test_utils::*;
5051
use crate::ln::msgs::{ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
5152
use crate::offers::invoice::Bolt12Invoice;
5253
use crate::offers::invoice_error::InvoiceError;
53-
use crate::offers::invoice_request::InvoiceRequest;
54+
use crate::offers::invoice_request::{InvoiceRequest, InvoiceRequestFields};
5455
use crate::offers::parse::Bolt12SemanticError;
5556
use crate::onion_message::messenger::PeeledOnion;
5657
use crate::onion_message::offers::OffersMessage;
@@ -380,7 +381,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
380381
.unwrap()
381382
.amount_msats(10_000_000)
382383
.build().unwrap();
383-
let payment_context = PaymentContext::Bolt12Offer { offer_id: offer.id() };
384384
assert_ne!(offer.signing_pubkey(), alice_id);
385385
assert!(!offer.paths().is_empty());
386386
for path in offer.paths() {
@@ -403,6 +403,17 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
403403
alice.onion_messenger.handle_onion_message(&bob_id, &onion_message);
404404

405405
let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
406+
let payment_context = PaymentContext::Bolt12Offer {
407+
offer_id: offer.id(),
408+
invoice_request: InvoiceRequestFields {
409+
payer_id: invoice_request.payer_id(),
410+
chain: Some(invoice_request.chain()),
411+
amount_msats: None,
412+
features: InvoiceRequestFeatures::empty(),
413+
quantity: None,
414+
payer_note: None,
415+
},
416+
};
406417
assert_eq!(invoice_request.amount_msats(), None);
407418
assert_ne!(invoice_request.payer_id(), david_id);
408419
assert_eq!(reply_path.unwrap().introduction_node_id, charlie_id);
@@ -532,7 +543,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
532543
.create_offer_builder("coffee".to_string()).unwrap()
533544
.amount_msats(10_000_000)
534545
.build().unwrap();
535-
let payment_context = PaymentContext::Bolt12Offer { offer_id: offer.id() };
536546
assert_ne!(offer.signing_pubkey(), alice_id);
537547
assert!(!offer.paths().is_empty());
538548
for path in offer.paths() {
@@ -547,6 +557,17 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
547557
alice.onion_messenger.handle_onion_message(&bob_id, &onion_message);
548558

549559
let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
560+
let payment_context = PaymentContext::Bolt12Offer {
561+
offer_id: offer.id(),
562+
invoice_request: InvoiceRequestFields {
563+
payer_id: invoice_request.payer_id(),
564+
chain: Some(invoice_request.chain()),
565+
amount_msats: None,
566+
features: InvoiceRequestFeatures::empty(),
567+
quantity: None,
568+
payer_note: None,
569+
},
570+
};
550571
assert_eq!(invoice_request.amount_msats(), None);
551572
assert_ne!(invoice_request.payer_id(), bob_id);
552573
assert_eq!(reply_path.unwrap().introduction_node_id, bob_id);
@@ -648,7 +669,6 @@ fn pays_for_offer_without_blinded_paths() {
648669
.clear_paths()
649670
.amount_msats(10_000_000)
650671
.build().unwrap();
651-
let payment_context = PaymentContext::Bolt12Offer { offer_id: offer.id() };
652672
assert_eq!(offer.signing_pubkey(), alice_id);
653673
assert!(offer.paths().is_empty());
654674

@@ -659,6 +679,19 @@ fn pays_for_offer_without_blinded_paths() {
659679
let onion_message = bob.onion_messenger.next_onion_message_for_peer(alice_id).unwrap();
660680
alice.onion_messenger.handle_onion_message(&bob_id, &onion_message);
661681

682+
let (invoice_request, _) = extract_invoice_request(alice, &onion_message);
683+
let payment_context = PaymentContext::Bolt12Offer {
684+
offer_id: offer.id(),
685+
invoice_request: InvoiceRequestFields {
686+
payer_id: invoice_request.payer_id(),
687+
chain: Some(invoice_request.chain()),
688+
amount_msats: None,
689+
features: InvoiceRequestFeatures::empty(),
690+
quantity: None,
691+
payer_note: None,
692+
},
693+
};
694+
662695
let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
663696
bob.onion_messenger.handle_onion_message(&alice_id, &onion_message);
664697

0 commit comments

Comments
 (0)