Skip to content

Commit 94fac1b

Browse files
shaavanshaavan
committed
f: Replace Option<RouteParametersConfig> with RouteParametersConfig
1 parent afc4b47 commit 94fac1b

File tree

8 files changed

+69
-70
lines changed

8 files changed

+69
-70
lines changed

‎lightning-dns-resolver/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ mod test {
170170
use lightning::onion_message::messenger::{
171171
AOnionMessenger, Destination, MessageRouter, OnionMessagePath, OnionMessenger,
172172
};
173+
use lightning::routing::router::RouteParametersConfig;
173174
use lightning::sign::{KeysManager, NodeSigner, Recipient};
174175
use lightning::types::features::InitFeatures;
175176
use lightning::types::payment::PaymentHash;
@@ -405,7 +406,7 @@ mod test {
405406
let amt = 42_000;
406407
nodes[0]
407408
.node
408-
.pay_for_offer_from_human_readable_name(name, amt, payment_id, retry, None, resolvers)
409+
.pay_for_offer_from_human_readable_name(name, amt, payment_id, retry, RouteParametersConfig::default(), resolvers)
409410
.unwrap();
410411

411412
let query = nodes[0].onion_messenger.next_onion_message_for_peer(resolver_id).unwrap();

‎lightning-persister/test_filesystem_store_0/monitors/4f128bedf1a15baf465ab1bfd6e97c8f82628f4156bf86eb1cbc132cda6733ae_0

5.71 KB
Binary file not shown.

‎lightning-persister/test_filesystem_store_1/monitors/4f128bedf1a15baf465ab1bfd6e97c8f82628f4156bf86eb1cbc132cda6733ae_0

6.13 KB
Binary file not shown.

‎lightning/src/ln/async_payments_tests.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::onion_message::messenger::{Destination, MessageRouter, MessageSendIns
3333
use crate::onion_message::offers::OffersMessage;
3434
use crate::onion_message::packet::ParsedOnionMessageContents;
3535
use crate::prelude::*;
36-
use crate::routing::router::{Payee, PaymentParameters};
36+
use crate::routing::router::{Payee, PaymentParameters, RouteParametersConfig};
3737
use crate::sign::NodeSigner;
3838
use crate::sync::Mutex;
3939
use crate::types::features::Bolt12InvoiceFeatures;
@@ -238,7 +238,7 @@ fn static_invoice_unknown_required_features() {
238238
let payment_id = PaymentId([1; 32]);
239239
nodes[0]
240240
.node
241-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), None)
241+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), RouteParametersConfig::default())
242242
.unwrap();
243243

244244
// Don't forward the invreq since we don't support retrieving the static invoice from the
@@ -298,7 +298,7 @@ fn ignore_unexpected_static_invoice() {
298298
let payment_id = PaymentId([1; 32]);
299299
nodes[0]
300300
.node
301-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), None)
301+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), RouteParametersConfig::default())
302302
.unwrap();
303303

304304
// Don't forward the invreq since we don't support retrieving the static invoice from the
@@ -415,7 +415,7 @@ fn async_receive_flow_success() {
415415
let payment_id = PaymentId([1; 32]);
416416
nodes[0]
417417
.node
418-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), None)
418+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), RouteParametersConfig::default())
419419
.unwrap();
420420
let release_held_htlc_om =
421421
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[2]).1;
@@ -463,7 +463,7 @@ fn expired_static_invoice_fail() {
463463
let payment_id = PaymentId([1; 32]);
464464
nodes[0]
465465
.node
466-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), None)
466+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), RouteParametersConfig::default())
467467
.unwrap();
468468

469469
let invreq_om = nodes[0]
@@ -546,7 +546,7 @@ fn async_receive_mpp() {
546546
let payment_id = PaymentId([1; 32]);
547547
nodes[0]
548548
.node
549-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), None)
549+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), RouteParametersConfig::default())
550550
.unwrap();
551551
let release_held_htlc_om_3_0 =
552552
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[3]).1;
@@ -630,7 +630,7 @@ fn amount_doesnt_match_invreq() {
630630
let payment_id = PaymentId([1; 32]);
631631
nodes[0]
632632
.node
633-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), None)
633+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), RouteParametersConfig::default())
634634
.unwrap();
635635
let release_held_htlc_om_3_0 =
636636
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[3]).1;
@@ -859,7 +859,7 @@ fn invalid_async_receive_with_retry<F1, F2>(
859859

860860
nodes[0]
861861
.node
862-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(2), None)
862+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(2), RouteParametersConfig::default())
863863
.unwrap();
864864
let release_held_htlc_om_2_0 =
865865
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[2]).1;
@@ -948,7 +948,7 @@ fn expired_static_invoice_message_path() {
948948
let payment_id = PaymentId([1; 32]);
949949
nodes[0]
950950
.node
951-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), None)
951+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), RouteParametersConfig::default())
952952
.unwrap();
953953

954954
// While the invoice is unexpired, respond with release_held_htlc.
@@ -1052,7 +1052,7 @@ fn expired_static_invoice_payment_path() {
10521052
let payment_id = PaymentId([1; 32]);
10531053
nodes[0]
10541054
.node
1055-
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), None)
1055+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), RouteParametersConfig::default())
10561056
.unwrap();
10571057
let release_held_htlc_om =
10581058
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[2]).1;

‎lightning/src/ln/channelmanager.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2123,7 +2123,7 @@ where
21232123
/// #
21242124
/// # fn example<T: AChannelManager>(
21252125
/// # channel_manager: T, offer: &Offer, quantity: Option<u64>, amount_msats: Option<u64>,
2126-
/// # payer_note: Option<String>, retry: Retry, route_params_config: Option<RouteParametersConfig>
2126+
/// # payer_note: Option<String>, retry: Retry, route_params_config: RouteParametersConfig
21272127
/// # ) {
21282128
/// # let channel_manager = channel_manager.get_cm();
21292129
/// let payment_id = PaymentId([42; 32]);
@@ -2180,7 +2180,7 @@ where
21802180
/// #
21812181
/// # fn example<T: AChannelManager>(
21822182
/// # channel_manager: T, amount_msats: u64, absolute_expiry: Duration, retry: Retry,
2183-
/// # route_params_config: Option<RouteParametersConfig>
2183+
/// # route_params_config: RouteParametersConfig
21842184
/// # ) -> Result<(), Bolt12SemanticError> {
21852185
/// # let channel_manager = channel_manager.get_cm();
21862186
/// let payment_id = PaymentId([42; 32]);
@@ -9884,7 +9884,7 @@ macro_rules! create_refund_builder { ($self: ident, $builder: ty) => {
98849884
/// [Avoiding Duplicate Payments]: #avoiding-duplicate-payments
98859885
pub fn create_refund_builder(
98869886
&$self, amount_msats: u64, absolute_expiry: Duration, payment_id: PaymentId,
9887-
retry_strategy: Retry, route_params_config: Option<RouteParametersConfig>
9887+
retry_strategy: Retry, route_params_config: RouteParametersConfig
98889888
) -> Result<$builder, Bolt12SemanticError> {
98899889
let node_id = $self.get_our_node_id();
98909890
let expanded_key = &$self.inbound_payment_key;
@@ -10085,7 +10085,7 @@ where
1008510085
pub fn pay_for_offer(
1008610086
&self, offer: &Offer, quantity: Option<u64>, amount_msats: Option<u64>,
1008710087
payer_note: Option<String>, payment_id: PaymentId, retry_strategy: Retry,
10088-
route_params_config: Option<RouteParametersConfig>
10088+
route_params_config: RouteParametersConfig
1008910089
) -> Result<(), Bolt12SemanticError> {
1009010090
self.pay_for_offer_intern(offer, quantity, amount_msats, payer_note, payment_id, None, |invoice_request, nonce| {
1009110091
let expiration = StaleExpiration::TimerTicks(1);
@@ -10329,7 +10329,7 @@ where
1032910329
#[cfg(feature = "dnssec")]
1033010330
pub fn pay_for_offer_from_human_readable_name(
1033110331
&self, name: HumanReadableName, amount_msats: u64, payment_id: PaymentId,
10332-
retry_strategy: Retry, route_params_config: Option<RouteParametersConfig>,
10332+
retry_strategy: Retry, route_params_config: RouteParametersConfig,
1033310333
dns_resolvers: Vec<Destination>,
1033410334
) -> Result<(), ()> {
1033510335
let (onion_message, context) =

‎lightning/src/ln/max_payment_path_len_tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use crate::ln::onion_utils::MIN_FINAL_VALUE_ESTIMATE_WITH_OVERPAY;
2626
use crate::ln::outbound_payment::{RecipientOnionFields, Retry, RetryableSendFailure};
2727
use crate::offers::nonce::Nonce;
2828
use crate::prelude::*;
29-
use crate::routing::router::{DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA, PaymentParameters, RouteParameters};
29+
use crate::routing::router::{PaymentParameters, RouteParameters, RouteParametersConfig, DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA};
3030
use crate::sign::NodeSigner;
3131
use crate::util::errors::APIError;
3232
use crate::util::ser::Writeable;
@@ -393,7 +393,7 @@ fn bolt12_invoice_too_large_blinded_paths() {
393393

394394
let offer = nodes[1].node.create_offer_builder(None).unwrap().build().unwrap();
395395
let payment_id = PaymentId([1; 32]);
396-
nodes[0].node.pay_for_offer(&offer, None, Some(5000), None, payment_id, Retry::Attempts(0), None).unwrap();
396+
nodes[0].node.pay_for_offer(&offer, None, Some(5000), None, payment_id, Retry::Attempts(0), RouteParametersConfig::default()).unwrap();
397397
let invreq_om = nodes[0].onion_messenger.next_onion_message_for_peer(nodes[1].node.get_our_node_id()).unwrap();
398398
nodes[1].onion_messenger.handle_onion_message(nodes[0].node.get_our_node_id(), &invreq_om);
399399

0 commit comments

Comments
 (0)