Skip to content

Commit 242759b

Browse files
TheBlueMattTheBlueMatt
committed
Clean up rustfmt verbosity introduced in 50644df
50644df added a new parameter to `pay_for_offer` and `pay_for_offer_from_human_readable_name`, but updated the tests by writing out the verbose parameter construction. This resulted in some tests blowing up from rustfmt nonsense, which we fix here.
1 parent ece4ab7 commit 242759b

File tree

2 files changed

+22
-95
lines changed

2 files changed

+22
-95
lines changed

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -393,27 +393,17 @@ mod test {
393393

394394
// When we get the proof back, override its contents to an offer from nodes[1]
395395
let bs_offer = nodes[1].node.create_offer_builder(None).unwrap().build().unwrap();
396-
nodes[0]
397-
.node
398-
.testing_dnssec_proof_offer_resolution_override
399-
.lock()
400-
.unwrap()
401-
.insert(name.clone(), bs_offer);
396+
let proof_override = &nodes[0].node.testing_dnssec_proof_offer_resolution_override;
397+
proof_override.lock().unwrap().insert(name.clone(), bs_offer);
402398

403399
let payment_id = PaymentId([42; 32]);
404400
let resolvers = vec![Destination::Node(resolver_id)];
405401
let retry = Retry::Attempts(0);
406402
let amt = 42_000;
403+
let params = RouteParametersConfig::default();
407404
nodes[0]
408405
.node
409-
.pay_for_offer_from_human_readable_name(
410-
name,
411-
amt,
412-
payment_id,
413-
retry,
414-
RouteParametersConfig::default(),
415-
resolvers,
416-
)
406+
.pay_for_offer_from_human_readable_name(name, amt, payment_id, retry, params, resolvers)
417407
.unwrap();
418408

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

‎lightning/src/ln/async_payments_tests.rs‎

Lines changed: 18 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,10 @@ fn static_invoice_unknown_required_features() {
236236

237237
let amt_msat = 5000;
238238
let payment_id = PaymentId([1; 32]);
239+
let params = RouteParametersConfig::default();
239240
nodes[0]
240241
.node
241-
.pay_for_offer(
242-
&offer,
243-
None,
244-
Some(amt_msat),
245-
None,
246-
payment_id,
247-
Retry::Attempts(0),
248-
RouteParametersConfig::default(),
249-
)
242+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), params)
250243
.unwrap();
251244

252245
// Don't forward the invreq since we don't support retrieving the static invoice from the
@@ -304,17 +297,10 @@ fn ignore_unexpected_static_invoice() {
304297
create_static_invoice(&nodes[1], &nodes[2], None, &secp_ctx);
305298
let amt_msat = 5000;
306299
let payment_id = PaymentId([1; 32]);
300+
let params = RouteParametersConfig::default();
307301
nodes[0]
308302
.node
309-
.pay_for_offer(
310-
&offer,
311-
None,
312-
Some(amt_msat),
313-
None,
314-
payment_id,
315-
Retry::Attempts(0),
316-
RouteParametersConfig::default(),
317-
)
303+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), params)
318304
.unwrap();
319305

320306
// Don't forward the invreq since we don't support retrieving the static invoice from the
@@ -429,17 +415,10 @@ fn async_receive_flow_success() {
429415

430416
let amt_msat = 5000;
431417
let payment_id = PaymentId([1; 32]);
418+
let params = RouteParametersConfig::default();
432419
nodes[0]
433420
.node
434-
.pay_for_offer(
435-
&offer,
436-
None,
437-
Some(amt_msat),
438-
None,
439-
payment_id,
440-
Retry::Attempts(0),
441-
RouteParametersConfig::default(),
442-
)
421+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), params)
443422
.unwrap();
444423
let release_held_htlc_om =
445424
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[2]).1;
@@ -485,17 +464,10 @@ fn expired_static_invoice_fail() {
485464

486465
let amt_msat = 5000;
487466
let payment_id = PaymentId([1; 32]);
467+
let params = RouteParametersConfig::default();
488468
nodes[0]
489469
.node
490-
.pay_for_offer(
491-
&offer,
492-
None,
493-
Some(amt_msat),
494-
None,
495-
payment_id,
496-
Retry::Attempts(0),
497-
RouteParametersConfig::default(),
498-
)
470+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), params)
499471
.unwrap();
500472

501473
let invreq_om = nodes[0]
@@ -576,17 +548,10 @@ fn async_receive_mpp() {
576548
// the different MPP parts to not be unique.
577549
let amt_msat = 15_000_000;
578550
let payment_id = PaymentId([1; 32]);
551+
let params = RouteParametersConfig::default();
579552
nodes[0]
580553
.node
581-
.pay_for_offer(
582-
&offer,
583-
None,
584-
Some(amt_msat),
585-
None,
586-
payment_id,
587-
Retry::Attempts(1),
588-
RouteParametersConfig::default(),
589-
)
554+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), params)
590555
.unwrap();
591556
let release_held_htlc_om_3_0 =
592557
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[3]).1;
@@ -668,17 +633,10 @@ fn amount_doesnt_match_invreq() {
668633

669634
let amt_msat = 5000;
670635
let payment_id = PaymentId([1; 32]);
636+
let params = RouteParametersConfig::default();
671637
nodes[0]
672638
.node
673-
.pay_for_offer(
674-
&offer,
675-
None,
676-
Some(amt_msat),
677-
None,
678-
payment_id,
679-
Retry::Attempts(1),
680-
RouteParametersConfig::default(),
681-
)
639+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), params)
682640
.unwrap();
683641
let release_held_htlc_om_3_0 =
684642
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[3]).1;
@@ -905,17 +863,10 @@ fn invalid_async_receive_with_retry<F1, F2>(
905863
let payment_hash: PaymentHash = keysend_preimage.into();
906864
*nodes[0].keys_manager.override_random_bytes.lock().unwrap() = Some(hardcoded_random_bytes);
907865

866+
let params = RouteParametersConfig::default();
908867
nodes[0]
909868
.node
910-
.pay_for_offer(
911-
&offer,
912-
None,
913-
Some(amt_msat),
914-
None,
915-
payment_id,
916-
Retry::Attempts(2),
917-
RouteParametersConfig::default(),
918-
)
869+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(2), params)
919870
.unwrap();
920871
let release_held_htlc_om_2_0 =
921872
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[2]).1;
@@ -1002,17 +953,10 @@ fn expired_static_invoice_message_path() {
1002953

1003954
let amt_msat = 5000;
1004955
let payment_id = PaymentId([1; 32]);
956+
let params = RouteParametersConfig::default();
1005957
nodes[0]
1006958
.node
1007-
.pay_for_offer(
1008-
&offer,
1009-
None,
1010-
Some(amt_msat),
1011-
None,
1012-
payment_id,
1013-
Retry::Attempts(1),
1014-
RouteParametersConfig::default(),
1015-
)
959+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(1), params)
1016960
.unwrap();
1017961

1018962
// While the invoice is unexpired, respond with release_held_htlc.
@@ -1114,17 +1058,10 @@ fn expired_static_invoice_payment_path() {
11141058
let (offer, static_invoice) = create_static_invoice(&nodes[1], &nodes[2], None, &secp_ctx);
11151059
let amt_msat = 5000;
11161060
let payment_id = PaymentId([1; 32]);
1061+
let params = RouteParametersConfig::default();
11171062
nodes[0]
11181063
.node
1119-
.pay_for_offer(
1120-
&offer,
1121-
None,
1122-
Some(amt_msat),
1123-
None,
1124-
payment_id,
1125-
Retry::Attempts(0),
1126-
RouteParametersConfig::default(),
1127-
)
1064+
.pay_for_offer(&offer, None, Some(amt_msat), None, payment_id, Retry::Attempts(0), params)
11281065
.unwrap();
11291066
let release_held_htlc_om =
11301067
pass_async_payments_oms(static_invoice, &nodes[0], &nodes[1], &nodes[2]).1;

0 commit comments

Comments
 (0)