|
43 | 43 | use bitcoin::network::constants::Network;
|
44 | 44 | use core::time::Duration;
|
45 | 45 | use crate::blinded_path::BlindedPath;
|
46 |
| -use crate::blinded_path::payment::PaymentContext; |
| 46 | +use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext}; |
47 | 47 | use crate::events::{Event, MessageSendEventsProvider, PaymentPurpose};
|
48 | 48 | use crate::ln::channelmanager::{PaymentId, RecentPaymentDetails, Retry, self};
|
49 | 49 | use crate::ln::functional_test_utils::*;
|
@@ -385,7 +385,7 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
|
385 | 385 | .unwrap()
|
386 | 386 | .amount_msats(10_000_000)
|
387 | 387 | .build().unwrap();
|
388 |
| - let payment_context = PaymentContext::Bolt12Offer { offer_id: offer.id() }; |
| 388 | + let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext { offer_id: offer.id() }); |
389 | 389 | assert_ne!(offer.signing_pubkey(), alice_id);
|
390 | 390 | assert!(!offer.paths().is_empty());
|
391 | 391 | for path in offer.paths() {
|
@@ -488,7 +488,7 @@ fn creates_and_pays_for_refund_using_two_hop_blinded_path() {
|
488 | 488 | }
|
489 | 489 | expect_recent_payment!(david, RecentPaymentDetails::AwaitingInvoice, payment_id);
|
490 | 490 |
|
491 |
| - let payment_context = PaymentContext::Bolt12Refund {}; |
| 491 | + let payment_context = PaymentContext::Bolt12Refund(Bolt12RefundContext {}); |
492 | 492 | let expected_invoice = alice.node.request_refund_payment(&refund).unwrap();
|
493 | 493 |
|
494 | 494 | connect_peers(alice, charlie);
|
@@ -537,7 +537,7 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
|
537 | 537 | .create_offer_builder("coffee".to_string()).unwrap()
|
538 | 538 | .amount_msats(10_000_000)
|
539 | 539 | .build().unwrap();
|
540 |
| - let payment_context = PaymentContext::Bolt12Offer { offer_id: offer.id() }; |
| 540 | + let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext { offer_id: offer.id() }); |
541 | 541 | assert_ne!(offer.signing_pubkey(), alice_id);
|
542 | 542 | assert!(!offer.paths().is_empty());
|
543 | 543 | for path in offer.paths() {
|
@@ -608,7 +608,7 @@ fn creates_and_pays_for_refund_using_one_hop_blinded_path() {
|
608 | 608 | }
|
609 | 609 | expect_recent_payment!(bob, RecentPaymentDetails::AwaitingInvoice, payment_id);
|
610 | 610 |
|
611 |
| - let payment_context = PaymentContext::Bolt12Refund {}; |
| 611 | + let payment_context = PaymentContext::Bolt12Refund(Bolt12RefundContext {}); |
612 | 612 | let expected_invoice = alice.node.request_refund_payment(&refund).unwrap();
|
613 | 613 |
|
614 | 614 | let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
|
@@ -653,7 +653,7 @@ fn pays_for_offer_without_blinded_paths() {
|
653 | 653 | .clear_paths()
|
654 | 654 | .amount_msats(10_000_000)
|
655 | 655 | .build().unwrap();
|
656 |
| - let payment_context = PaymentContext::Bolt12Offer { offer_id: offer.id() }; |
| 656 | + let payment_context = PaymentContext::Bolt12Offer(Bolt12OfferContext { offer_id: offer.id() }); |
657 | 657 | assert_eq!(offer.signing_pubkey(), alice_id);
|
658 | 658 | assert!(offer.paths().is_empty());
|
659 | 659 |
|
@@ -704,7 +704,7 @@ fn pays_for_refund_without_blinded_paths() {
|
704 | 704 | assert!(refund.paths().is_empty());
|
705 | 705 | expect_recent_payment!(bob, RecentPaymentDetails::AwaitingInvoice, payment_id);
|
706 | 706 |
|
707 |
| - let payment_context = PaymentContext::Bolt12Refund {}; |
| 707 | + let payment_context = PaymentContext::Bolt12Refund(Bolt12RefundContext {}); |
708 | 708 | let expected_invoice = alice.node.request_refund_payment(&refund).unwrap();
|
709 | 709 |
|
710 | 710 | let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
|
@@ -1089,7 +1089,7 @@ fn fails_paying_invoice_more_than_once() {
|
1089 | 1089 | david.onion_messenger.handle_onion_message(&charlie_id, &onion_message);
|
1090 | 1090 |
|
1091 | 1091 | // David pays the first invoice
|
1092 |
| - let payment_context = PaymentContext::Bolt12Refund {}; |
| 1092 | + let payment_context = PaymentContext::Bolt12Refund(Bolt12RefundContext {}); |
1093 | 1093 | let invoice1 = extract_invoice(david, &onion_message);
|
1094 | 1094 |
|
1095 | 1095 | route_bolt12_payment(david, &[charlie, bob, alice], &invoice1);
|
|
0 commit comments