Skip to content

Commit 6b0d94a

Browse files
TheBlueMattTheBlueMatt
committed
Use Default::default() to construct () as a test scoring param
In bindings, we can't use unbounded generic types, and thus have to rip out the `ScoreParams` and replace them with static `ProbabilisticScoringFeeParams` universally. To make this easier, using `Default::default()` everywhere allows the type to change out from under the test without the test needing to change.
1 parent f2fe95e commit 6b0d94a

7 files changed

+124
-124
lines changed

‎lightning/src/ln/channelmanager.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10190,7 +10190,7 @@ mod tests {
1019010190
TEST_FINAL_CLTV, false), 100_000);
1019110191
let route = find_route(
1019210192
&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
10193-
None, nodes[0].logger, &scorer, &(), &random_seed_bytes
10193+
None, nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
1019410194
).unwrap();
1019510195
nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
1019610196
RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
@@ -10224,7 +10224,7 @@ mod tests {
1022410224
let payment_preimage = PaymentPreimage([42; 32]);
1022510225
let route = find_route(
1022610226
&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
10227-
None, nodes[0].logger, &scorer, &(), &random_seed_bytes
10227+
None, nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
1022810228
).unwrap();
1022910229
let payment_hash = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
1023010230
RecipientOnionFields::spontaneous_empty(), PaymentId(payment_preimage.0)).unwrap();
@@ -10281,7 +10281,7 @@ mod tests {
1028110281
);
1028210282
let route = find_route(
1028310283
&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph,
10284-
None, nodes[0].logger, &scorer, &(), &random_seed_bytes
10284+
None, nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
1028510285
).unwrap();
1028610286
let payment_id_2 = PaymentId([45; 32]);
1028710287
nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage),
@@ -10332,7 +10332,7 @@ mod tests {
1033210332
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
1033310333
let route = find_route(
1033410334
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
10335-
nodes[0].logger, &scorer, &(), &random_seed_bytes
10335+
nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
1033610336
).unwrap();
1033710337

1033810338
let test_preimage = PaymentPreimage([42; 32]);
@@ -10377,7 +10377,7 @@ mod tests {
1037710377
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
1037810378
let route = find_route(
1037910379
&payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
10380-
nodes[0].logger, &scorer, &(), &random_seed_bytes
10380+
nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
1038110381
).unwrap();
1038210382

1038310383
let test_preimage = PaymentPreimage([42; 32]);

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,7 @@ pub fn get_route(send_node: &Node, route_params: &RouteParameters) -> Result<Rou
18541854
router::get_route(
18551855
&send_node.node.get_our_node_id(), route_params, &send_node.network_graph.read_only(),
18561856
Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
1857-
send_node.logger, &scorer, &(), &random_seed_bytes
1857+
send_node.logger, &scorer, &Default::default(), &random_seed_bytes
18581858
)
18591859
}
18601860

@@ -2506,7 +2506,7 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
25062506
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
25072507
let random_seed_bytes = keys_manager.get_secure_random_bytes();
25082508
let route = router::get_route(&origin_node.node.get_our_node_id(), &route_params, &network_graph,
2509-
None, origin_node.logger, &scorer, &(), &random_seed_bytes).unwrap();
2509+
None, origin_node.logger, &scorer, &Default::default(), &random_seed_bytes).unwrap();
25102510
assert_eq!(route.paths.len(), 1);
25112511
assert_eq!(route.paths[0].hops.len(), expected_route.len());
25122512
for (node, hop) in expected_route.iter().zip(route.paths[0].hops.iter()) {

‎lightning/src/ln/functional_tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7231,7 +7231,7 @@ fn test_check_htlc_underpaying() {
72317231
TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
72327232
let route_params = RouteParameters::from_payment_params_and_value(payment_params, 10_000);
72337233
let route = get_route(&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph.read_only(),
7234-
None, nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
7234+
None, nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes).unwrap();
72357235
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
72367236
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
72377237
nodes[0].node.send_payment_with_route(&route, our_payment_hash,
@@ -7489,12 +7489,12 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
74897489
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
74907490
let route_params = RouteParameters::from_payment_params_and_value(payment_params, 3_000_000);
74917491
let route = get_route(&nodes[0].node.get_our_node_id(), &route_params, &nodes[0].network_graph.read_only(), None,
7492-
nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
7492+
nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes).unwrap();
74937493
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
74947494
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
74957495
let route_params = RouteParameters::from_payment_params_and_value(payment_params, 3_000_000);
74967496
let route = get_route(&nodes[1].node.get_our_node_id(), &route_params, &nodes[1].network_graph.read_only(), None,
7497-
nodes[0].logger, &scorer, &(), &random_seed_bytes).unwrap();
7497+
nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes).unwrap();
74987498
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
74997499

75007500
let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);

‎lightning/src/ln/onion_route_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ macro_rules! get_phantom_route {
10521052
(get_route(
10531053
&$nodes[0].node.get_our_node_id(), &route_params, &network_graph,
10541054
Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
1055-
$nodes[0].logger, &scorer, &(), &[0u8; 32]
1055+
$nodes[0].logger, &scorer, &Default::default(), &[0u8; 32]
10561056
).unwrap(), phantom_route_hint.phantom_scid)
10571057
}
10581058
}}

‎lightning/src/ln/payment_tests.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ fn do_test_keysend_payments(public_node: bool, with_retry: bool) {
267267
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
268268
let route = find_route(
269269
&payer_pubkey, &route_params, &network_graph, first_hops,
270-
nodes[0].logger, &scorer, &(), &random_seed_bytes
270+
nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
271271
).unwrap();
272272

273273
{
@@ -320,7 +320,7 @@ fn test_mpp_keysend() {
320320
let scorer = test_utils::TestScorer::new();
321321
let random_seed_bytes = chanmon_cfgs[0].keys_manager.get_secure_random_bytes();
322322
let route = find_route(&payer_pubkey, &route_params, &network_graph, None, nodes[0].logger,
323-
&scorer, &(), &random_seed_bytes).unwrap();
323+
&scorer, &Default::default(), &random_seed_bytes).unwrap();
324324

325325
let payment_preimage = PaymentPreimage([42; 32]);
326326
let payment_secret = PaymentSecret(payment_preimage.0);
@@ -1106,7 +1106,7 @@ fn get_ldk_payment_preimage() {
11061106
let route = get_route( &nodes[0].node.get_our_node_id(), &route_params,
11071107
&nodes[0].network_graph.read_only(),
11081108
Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()), nodes[0].logger,
1109-
&scorer, &(), &random_seed_bytes).unwrap();
1109+
&scorer, &Default::default(), &random_seed_bytes).unwrap();
11101110
nodes[0].node.send_payment_with_route(&route, payment_hash,
11111111
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
11121112
check_added_monitors!(nodes[0], 1);
@@ -1750,9 +1750,9 @@ fn do_test_intercepted_payment(test: InterceptTest) {
17501750
]).unwrap()
17511751
.with_bolt11_features(nodes[2].node.invoice_features()).unwrap();
17521752
let route_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat,);
1753-
let route = get_route( &nodes[0].node.get_our_node_id(), &route_params,
1754-
&nodes[0].network_graph.read_only(), None, nodes[0].logger, &scorer, &(),
1755-
&random_seed_bytes,).unwrap();
1753+
let route = get_route(&nodes[0].node.get_our_node_id(), &route_params,
1754+
&nodes[0].network_graph.read_only(), None, nodes[0].logger, &scorer, &Default::default(),
1755+
&random_seed_bytes).unwrap();
17561756

17571757
let (payment_hash, payment_secret) = nodes[2].node.create_inbound_payment(Some(amt_msat), 60 * 60, None).unwrap();
17581758
nodes[0].node.send_payment_with_route(&route, payment_hash,

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@ fn updates_shutdown_wait() {
315315
let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
316316
let route_params = RouteParameters::from_payment_params_and_value(payment_params_1, 100_000);
317317
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &route_params,
318-
&nodes[0].network_graph.read_only(), None, &logger, &scorer, &(), &random_seed_bytes).unwrap();
318+
&nodes[0].network_graph.read_only(), None, &logger, &scorer, &Default::default(), &random_seed_bytes).unwrap();
319319
let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(),
320320
TEST_FINAL_CLTV).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
321321
let route_params = RouteParameters::from_payment_params_and_value(payment_params_2, 100_000);
322322
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &route_params,
323-
&nodes[1].network_graph.read_only(), None, &logger, &scorer, &(), &random_seed_bytes).unwrap();
323+
&nodes[1].network_graph.read_only(), None, &logger, &scorer, &Default::default(), &random_seed_bytes).unwrap();
324324
unwrap_send_err!(nodes[0].node.send_payment_with_route(&route_1, payment_hash,
325325
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
326326
), true, APIError::ChannelUnavailable {..}, {});

0 commit comments

Comments
 (0)