Merge pull request #2417 from tnull/2023-07-max-total-fee
[rust-lightning] / lightning / src / routing / router.rs
index c680d57a6dc4f05e97d838d038e2e90276f92874..c20ce2e97ee835ca0cf2c77b8c7526c08dba5855 100644 (file)
@@ -2348,8 +2348,9 @@ where L::Target: Logger {
                                        // Decrease the available liquidity of a hop in the middle of the path.
                                        let victim_candidate = &payment_path.hops[(payment_path.hops.len()) / 2].0.candidate;
                                        let exhausted = u64::max_value();
-                                       log_trace!(logger, "Disabling route candidate {} for future path building iterations to
-                                               avoid duplicates.", LoggedCandidateHop(victim_candidate));
+                                       log_trace!(logger,
+                                               "Disabling route candidate {} for future path building iterations to avoid duplicates.",
+                                               LoggedCandidateHop(victim_candidate));
                                        *used_liquidities.entry(victim_candidate.id(false)).or_default() = exhausted;
                                        *used_liquidities.entry(victim_candidate.id(true)).or_default() = exhausted;
                                }
@@ -2735,7 +2736,7 @@ fn build_route_from_hops_internal<L: Deref>(
 
        let scorer = HopScorer { our_node_id, hop_ids };
 
-       get_route(our_node_pubkey, route_params, network_graph, None, logger, &scorer, &(), random_seed_bytes)
+       get_route(our_node_pubkey, route_params, network_graph, None, logger, &scorer, &Default::default(), random_seed_bytes)
 }
 
 #[cfg(test)]
@@ -2831,14 +2832,14 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 0);
                if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
-                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes) {
+                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes) {
                                assert_eq!(err, "Cannot send a payment of 0 msat");
                } else { panic!(); }
 
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -2872,12 +2873,12 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
                        &route_params, &network_graph.read_only(), Some(&our_chans.iter().collect::<Vec<_>>()),
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes) {
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes) {
                                assert_eq!(err, "First hop cannot have our_node_pubkey as a destination.");
                } else { panic!(); }
  
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
        }
 
@@ -2988,8 +2989,8 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, 199_999_999);
                if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
-                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes) {
+                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes) {
                                assert_eq!(err, "Failed to find a path to the given destination");
                } else { panic!(); }
 
@@ -3009,7 +3010,7 @@ mod tests {
 
                // A payment above the minimum should pass
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
        }
 
@@ -3094,7 +3095,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 60_000);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                // Overpay fees to hit htlc_minimum_msat.
                let overpaid_fees = route.paths[0].hops[0].fee_msat + route.paths[1].hops[0].fee_msat;
                // TODO: this could be better balanced to overpay 10k and not 15k.
@@ -3140,7 +3141,7 @@ mod tests {
                });
 
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                // Fine to overpay for htlc_minimum_msat if it allows us to save fee.
                assert_eq!(route.paths.len(), 1);
                assert_eq!(route.paths[0].hops[0].short_channel_id, 12);
@@ -3149,7 +3150,7 @@ mod tests {
 
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 50_000);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                // Not fine to overpay for htlc_minimum_msat if it requires paying more than fee on
                // the other channel.
                assert_eq!(route.paths.len(), 1);
@@ -3196,8 +3197,8 @@ mod tests {
                // If all the channels require some features we don't understand, route should fail
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
-                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes) {
+                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes) {
                                assert_eq!(err, "Failed to find a path to the given destination");
                } else { panic!(); }
 
@@ -3205,8 +3206,8 @@ mod tests {
                let our_chans = vec![get_channel_details(Some(42), nodes[7].clone(),
                        InitFeatures::from_le_bytes(vec![0b11]), 250_000_000)];
                let route = get_route(&our_id, &route_params, &network_graph.read_only(),
-                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[7]);
@@ -3243,8 +3244,8 @@ mod tests {
                // If all nodes require some features we don't understand, route should fail
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
-                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes) {
+                       &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes) {
                                assert_eq!(err, "Failed to find a path to the given destination");
                } else { panic!(); }
 
@@ -3252,8 +3253,8 @@ mod tests {
                let our_chans = vec![get_channel_details(Some(42), nodes[7].clone(),
                        InitFeatures::from_le_bytes(vec![0b11]), 250_000_000)];
                let route = get_route(&our_id, &route_params, &network_graph.read_only(),
-                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[7]);
@@ -3287,7 +3288,7 @@ mod tests {
                let payment_params = PaymentParameters::from_node_id(nodes[0], 42);
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 3);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3317,8 +3318,8 @@ mod tests {
                let our_chans = vec![get_channel_details(Some(42), nodes[7].clone(),
                        InitFeatures::from_le_bytes(vec![0b11]), 250_000_000)];
                let route = get_route(&our_id, &route_params, &network_graph.read_only(),
-                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[7]);
@@ -3444,8 +3445,8 @@ mod tests {
                                .with_route_hints(invalid_last_hops).unwrap();
                        let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
-                               &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer, &(),
-                               &random_seed_bytes) {
+                               &route_params, &network_graph.read_only(), None, Arc::clone(&logger), &scorer,
+                               &Default::default(), &random_seed_bytes) {
                                        assert_eq!(err, "Route hint cannot have the payee as the source.");
                        } else { panic!(); }
                }
@@ -3454,7 +3455,7 @@ mod tests {
                        .with_route_hints(last_hops_multi_private_channels(&nodes)).unwrap();
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 5);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3531,7 +3532,7 @@ mod tests {
                // Test handling of an empty RouteHint passed in Invoice.
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 5);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3639,7 +3640,7 @@ mod tests {
 
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 4);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3713,7 +3714,7 @@ mod tests {
 
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &[42u8; 32]).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &[42u8; 32]).unwrap();
                assert_eq!(route.paths[0].hops.len(), 4);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3797,7 +3798,7 @@ mod tests {
 
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 5);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3853,8 +3854,8 @@ mod tests {
                        .with_route_hints(last_hops.clone()).unwrap();
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(),
-                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 2);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[3]);
@@ -3879,7 +3880,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 4);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3915,7 +3916,7 @@ mod tests {
                // ...but still use 8 for larger payments as 6 has a variable feerate
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 2000);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths[0].hops.len(), 5);
 
                assert_eq!(route.paths[0].hops[0].pubkey, nodes[1]);
@@ -3982,7 +3983,7 @@ mod tests {
                let network_graph = NetworkGraph::new(Network::Testnet, &logger);
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, route_val);
                let route = get_route(&source_node_id, &route_params, &network_graph.read_only(),
-                               Some(&our_chans.iter().collect::<Vec<_>>()), &logger, &scorer, &(),
+                               Some(&our_chans.iter().collect::<Vec<_>>()), &logger, &scorer, &Default::default(),
                                &random_seed_bytes);
                route
        }
@@ -4108,7 +4109,7 @@ mod tests {
                                payment_params.clone(), 250_000_001);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None,
-                                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes) {
+                                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4118,7 +4119,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 250_000_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(),&random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let path = route.paths.last().unwrap();
                        assert_eq!(path.hops.len(), 2);
@@ -4151,7 +4152,7 @@ mod tests {
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(),
                                        Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
-                                       &(), &random_seed_bytes) {
+                                       &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4161,8 +4162,8 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 200_000_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(),
-                               Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                               &random_seed_bytes).unwrap();
+                               Some(&our_chans.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                               &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let path = route.paths.last().unwrap();
                        assert_eq!(path.hops.len(), 2);
@@ -4205,7 +4206,7 @@ mod tests {
                                payment_params.clone(), 15_001);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4215,7 +4216,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 15_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let path = route.paths.last().unwrap();
                        assert_eq!(path.hops.len(), 2);
@@ -4282,7 +4283,7 @@ mod tests {
                                payment_params.clone(), 15_001);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4292,7 +4293,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 15_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let path = route.paths.last().unwrap();
                        assert_eq!(path.hops.len(), 2);
@@ -4320,7 +4321,7 @@ mod tests {
                                payment_params.clone(), 10_001);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4330,7 +4331,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 10_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let path = route.paths.last().unwrap();
                        assert_eq!(path.hops.len(), 2);
@@ -4438,7 +4439,7 @@ mod tests {
                                payment_params.clone(), 60_000);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4448,7 +4449,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 49_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -4464,7 +4465,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 50_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -4515,7 +4516,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 50_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -4684,7 +4685,7 @@ mod tests {
                                payment_params.clone(), 300_000);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                &our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes) {
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes) {
                                        assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4696,7 +4697,7 @@ mod tests {
                                zero_payment_params, 100);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                &our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes) {
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes) {
                                        assert_eq!(err, "Can't find a route with no paths allowed.");
                        } else { panic!(); }
                }
@@ -4710,7 +4711,7 @@ mod tests {
                                fail_payment_params, 250_000);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                &our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes) {
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes) {
                                        assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4721,7 +4722,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 250_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 3);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -4741,7 +4742,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 290_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 3);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -4915,7 +4916,7 @@ mod tests {
                                payment_params.clone(), 350_000);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -4926,7 +4927,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 300_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 3);
 
                        let mut total_amount_paid_msat = 0;
@@ -5090,7 +5091,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 180_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 2);
 
                        let mut total_value_transferred_msat = 0;
@@ -5264,7 +5265,7 @@ mod tests {
                                payment_params.clone(), 210_000);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -5285,7 +5286,7 @@ mod tests {
                        let route_params = RouteParameters { payment_params: payment_params.clone(), final_value_msat: 200_000,
                                max_total_routing_fee_msat: Some(150_000) };
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 2);
 
                        let mut total_amount_paid_msat = 0;
@@ -5388,7 +5389,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, 100_000);
                let mut route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 2);
                route.paths.sort_by_key(|path| path.hops[0].short_channel_id);
                // Paths are manually ordered ordered by SCID, so:
@@ -5510,7 +5511,7 @@ mod tests {
                                payment_params.clone(), 150_000);
                        if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(
                                        &our_id, &route_params, &network_graph.read_only(), None, Arc::clone(&logger),
-                                       &scorer, &(), &random_seed_bytes) {
+                                       &scorer, &Default::default(), &random_seed_bytes) {
                                                assert_eq!(err, "Failed to find a sufficient route to the given destination");
                        } else { panic!(); }
                }
@@ -5521,7 +5522,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 125_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 3);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -5537,7 +5538,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 90_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 2);
                        let mut total_amount_paid_msat = 0;
                        for path in &route.paths {
@@ -5679,7 +5680,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 10_000);
                        let route = get_route(&our_id, &route_params, &network.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        assert_eq!(route.paths[0].hops.len(), 3);
 
@@ -5753,7 +5754,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 90_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        assert_eq!(route.paths[0].hops.len(), 2);
 
@@ -5822,7 +5823,7 @@ mod tests {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params, 90_000);
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        assert_eq!(route.paths[0].hops.len(), 2);
 
@@ -5866,7 +5867,7 @@ mod tests {
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), Some(&[
                                &get_channel_details(Some(3), nodes[0], channelmanager::provided_init_features(&config), 200_000),
                                &get_channel_details(Some(2), nodes[0], channelmanager::provided_init_features(&config), 10_000),
-                       ]), Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       ]), Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        assert_eq!(route.paths[0].hops.len(), 1);
 
@@ -5880,7 +5881,7 @@ mod tests {
                        let route = get_route(&our_id, &route_params, &network_graph.read_only(), Some(&[
                                &get_channel_details(Some(3), nodes[0], channelmanager::provided_init_features(&config), 50_000),
                                &get_channel_details(Some(2), nodes[0], channelmanager::provided_init_features(&config), 50_000),
-                       ]), Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       ]), Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 2);
                        assert_eq!(route.paths[0].hops.len(), 1);
                        assert_eq!(route.paths[1].hops.len(), 1);
@@ -5914,7 +5915,7 @@ mod tests {
                                &get_channel_details(Some(8), nodes[0], channelmanager::provided_init_features(&config), 50_000),
                                &get_channel_details(Some(9), nodes[0], channelmanager::provided_init_features(&config), 50_000),
                                &get_channel_details(Some(4), nodes[0], channelmanager::provided_init_features(&config), 1_000_000),
-                       ]), Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       ]), Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                        assert_eq!(route.paths.len(), 1);
                        assert_eq!(route.paths[0].hops.len(), 1);
 
@@ -5937,7 +5938,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 100);
                let route = get_route( &our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                let path = route.paths[0].hops.iter().map(|hop| hop.short_channel_id).collect::<Vec<_>>();
 
                assert_eq!(route.get_total_fees(), 100);
@@ -5950,7 +5951,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, 100);
                let route = get_route( &our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                let path = route.paths[0].hops.iter().map(|hop| hop.short_channel_id).collect::<Vec<_>>();
 
                assert_eq!(route.get_total_fees(), 300);
@@ -6003,7 +6004,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, 100);
                let route = get_route( &our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                let path = route.paths[0].hops.iter().map(|hop| hop.short_channel_id).collect::<Vec<_>>();
 
                assert_eq!(route.get_total_fees(), 100);
@@ -6013,7 +6014,7 @@ mod tests {
                // A different path to nodes[6] exists if channel 6 cannot be routed over.
                let scorer = BadChannelScorer { short_channel_id: 6 };
                let route = get_route( &our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                let path = route.paths[0].hops.iter().map(|hop| hop.short_channel_id).collect::<Vec<_>>();
 
                assert_eq!(route.get_total_fees(), 300);
@@ -6023,7 +6024,7 @@ mod tests {
                // A path to nodes[6] does not exist if nodes[2] cannot be routed through.
                let scorer = BadNodeScorer { node_id: NodeId::from_pubkey(&nodes[2]) };
                match get_route( &our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes) {
+                       &scorer, &Default::default(), &random_seed_bytes) {
                                Err(LightningError { err, .. } ) => {
                                        assert_eq!(err, "Failed to find a path to the given destination");
                                },
@@ -6119,7 +6120,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        feasible_payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                let path = route.paths[0].hops.iter().map(|hop| hop.short_channel_id).collect::<Vec<_>>();
                assert_ne!(path.len(), 0);
 
@@ -6130,7 +6131,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        fail_payment_params, 100);
                match get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger), &scorer,
-                       &(), &random_seed_bytes)
+                       &Default::default(), &random_seed_bytes)
                {
                        Err(LightningError { err, .. } ) => {
                                assert_eq!(err, "Failed to find a path to the given destination");
@@ -6158,12 +6159,12 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 100);
                assert!(get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).is_ok());
+                       &scorer, &Default::default(), &random_seed_bytes).is_ok());
                loop {
                        let route_params = RouteParameters::from_payment_params_and_value(
                                payment_params.clone(), 100);
                        if let Ok(route) = get_route(&our_id, &route_params, &network_graph, None,
-                               Arc::clone(&logger), &scorer, &(), &random_seed_bytes)
+                               Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes)
                        {
                                for chan in route.paths[0].hops.iter() {
                                        assert!(!payment_params.previously_failed_channels.contains(&chan.short_channel_id));
@@ -6190,7 +6191,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        feasible_payment_params, 100);
                let route = get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                let path = route.paths[0].hops.iter().map(|hop| hop.short_channel_id).collect::<Vec<_>>();
                assert!(path.len() == MAX_PATH_LENGTH_ESTIMATE.into());
 
@@ -6199,7 +6200,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        fail_payment_params, 100);
                match get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger), &scorer,
-                       &(), &random_seed_bytes)
+                       &Default::default(), &random_seed_bytes)
                {
                        Err(LightningError { err, .. } ) => {
                                assert_eq!(err, "Failed to find a path to the given destination");
@@ -6221,7 +6222,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 100);
                let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 1);
 
                let cltv_expiry_deltas_before = route.paths[0].hops.iter().map(|h| h.cltv_expiry_delta).collect::<Vec<u32>>();
@@ -6258,7 +6259,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), 100);
                let mut route = get_route(&our_id, &route_params, &network_graph, None,
-                       Arc::clone(&logger), &scorer, &(), &random_seed_bytes).unwrap();
+                       Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
                add_random_cltv_offset(&mut route, &payment_params, &network_graph, &random_seed_bytes);
 
                let mut path_plausibility = vec![];
@@ -6528,7 +6529,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, max_htlc_msat + 1);
                if let Err(LightningError{err, action: ErrorAction::IgnoreError}) = get_route(&our_id,
-                       &route_params, &netgraph, None, Arc::clone(&logger), &scorer, &(),
+                       &route_params, &netgraph, None, Arc::clone(&logger), &scorer, &Default::default(),
                        &random_seed_bytes)
                {
                        assert_eq!(err, "Failed to find a sufficient route to the given destination");
@@ -6543,7 +6544,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, max_htlc_msat + 1);
                let route = get_route(&our_id, &route_params, &netgraph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 2);
                assert!(route.paths[0].hops.last().unwrap().fee_msat <= max_htlc_msat);
                assert!(route.paths[1].hops.last().unwrap().fee_msat <= max_htlc_msat);
@@ -6599,8 +6600,8 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, amt_msat);
                let route = get_route(&our_node_id, &route_params, &network_graph.read_only(),
-                       Some(&first_hop.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&first_hop.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 2);
                assert!(route.paths[0].hops.last().unwrap().fee_msat <= max_htlc_msat);
                assert!(route.paths[1].hops.last().unwrap().fee_msat <= max_htlc_msat);
@@ -6613,8 +6614,8 @@ mod tests {
                        get_channel_details(Some(43), intermed_node_id, InitFeatures::from_le_bytes(vec![0b11]), amt_msat - 10),
                ];
                let route = get_route(&our_node_id, &route_params, &network_graph.read_only(),
-                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 2);
                assert!(route.paths[0].hops.last().unwrap().fee_msat <= max_htlc_msat);
                assert!(route.paths[1].hops.last().unwrap().fee_msat <= max_htlc_msat);
@@ -6645,8 +6646,8 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, amt_msat);
                let route = get_route(&our_node_id, &route_params, &network_graph.read_only(),
-                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 2);
                assert!(route.paths[0].hops.last().unwrap().fee_msat <= max_htlc_msat);
                assert!(route.paths[1].hops.last().unwrap().fee_msat <= max_htlc_msat);
@@ -6844,7 +6845,7 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, 1001);
                let route = get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 1);
                assert_eq!(route.paths[0].hops.len(), 2);
 
@@ -6899,7 +6900,7 @@ mod tests {
                        (blinded_payinfo.clone(), invalid_blinded_path_2)]);
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 1001);
                match get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes)
+                       &scorer, &Default::default(), &random_seed_bytes)
                {
                        Err(LightningError { err, .. }) => {
                                assert_eq!(err, "1-hop blinded paths must all have matching introduction node ids");
@@ -6911,7 +6912,7 @@ mod tests {
                let payment_params = PaymentParameters::blinded(vec![(blinded_payinfo.clone(), invalid_blinded_path.clone())]);
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 1001);
                match get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger), &scorer,
-                       &(), &random_seed_bytes)
+                       &Default::default(), &random_seed_bytes)
                {
                        Err(LightningError { err, .. }) => {
                                assert_eq!(err, "Cannot generate a route to blinded paths if we are the introduction node to all of them");
@@ -6924,7 +6925,7 @@ mod tests {
                let payment_params = PaymentParameters::blinded(vec![(blinded_payinfo, invalid_blinded_path)]);
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 1001);
                match get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger), &scorer,
-                       &(), &random_seed_bytes)
+                       &Default::default(), &random_seed_bytes)
                {
                        Err(LightningError { err, .. }) => {
                                assert_eq!(err, "0-hop blinded path provided");
@@ -6978,7 +6979,7 @@ mod tests {
 
                let route_params = RouteParameters::from_payment_params_and_value(payment_params, 100_000);
                let route = get_route(&our_id, &route_params, &network_graph, None, Arc::clone(&logger),
-                       &scorer, &(), &random_seed_bytes).unwrap();
+                       &scorer, &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.paths.len(), 2);
                let mut total_amount_paid_msat = 0;
                for path in route.paths.into_iter() {
@@ -7067,8 +7068,8 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params.clone(), amt_msat);
                if let Err(LightningError { err, .. }) = get_route(&nodes[0], &route_params, &netgraph,
-                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes) {
+                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes) {
                                assert_eq!(err, "Failed to find a path to the given destination");
                } else { panic!("Expected error") }
 
@@ -7077,8 +7078,8 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, amt_minus_blinded_path_fee);
                let route = get_route(&nodes[0], &route_params, &netgraph,
-                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.get_total_fees(), blinded_payinfo.fee_base_msat as u64);
                assert_eq!(route.get_total_amount(), amt_minus_blinded_path_fee);
        }
@@ -7146,8 +7147,8 @@ mod tests {
                let route_params = RouteParameters::from_payment_params_and_value(
                        payment_params, amt_msat);
                let route = get_route(&nodes[0], &route_params, &netgraph,
-                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer, &(),
-                       &random_seed_bytes).unwrap();
+                       Some(&first_hops.iter().collect::<Vec<_>>()), Arc::clone(&logger), &scorer,
+                       &Default::default(), &random_seed_bytes).unwrap();
                assert_eq!(route.get_total_fees(), blinded_payinfo.fee_base_msat as u64);
                assert_eq!(route.get_total_amount(), amt_msat);
        }
@@ -7362,15 +7363,15 @@ pub mod benches {
                let logger = TestLogger::new();
                let network_graph = bench_utils::read_network_graph(&logger).unwrap();
                let scorer = FixedPenaltyScorer::with_penalty(0);
-               generate_routes(bench, &network_graph, scorer, &(), Bolt11InvoiceFeatures::empty(), 0,
-                       "generate_routes_with_zero_penalty_scorer");
+               generate_routes(bench, &network_graph, scorer, &Default::default(),
+                       Bolt11InvoiceFeatures::empty(), 0, "generate_routes_with_zero_penalty_scorer");
        }
 
        pub fn generate_mpp_routes_with_zero_penalty_scorer(bench: &mut Criterion) {
                let logger = TestLogger::new();
                let network_graph = bench_utils::read_network_graph(&logger).unwrap();
                let scorer = FixedPenaltyScorer::with_penalty(0);
-               generate_routes(bench, &network_graph, scorer, &(),
+               generate_routes(bench, &network_graph, scorer, &Default::default(),
                        channelmanager::provided_invoice_features(&UserConfig::default()), 0,
                        "generate_mpp_routes_with_zero_penalty_scorer");
        }
@@ -7404,6 +7405,42 @@ pub mod benches {
                        "generate_large_mpp_routes_with_probabilistic_scorer");
        }
 
+       pub fn generate_routes_with_nonlinear_probabilistic_scorer(bench: &mut Criterion) {
+               let logger = TestLogger::new();
+               let network_graph = bench_utils::read_network_graph(&logger).unwrap();
+               let mut params = ProbabilisticScoringFeeParameters::default();
+               params.linear_success_probability = false;
+               let scorer = ProbabilisticScorer::new(
+                       ProbabilisticScoringDecayParameters::default(), &network_graph, &logger);
+               generate_routes(bench, &network_graph, scorer, &params,
+                       channelmanager::provided_invoice_features(&UserConfig::default()), 0,
+                       "generate_routes_with_nonlinear_probabilistic_scorer");
+       }
+
+       pub fn generate_mpp_routes_with_nonlinear_probabilistic_scorer(bench: &mut Criterion) {
+               let logger = TestLogger::new();
+               let network_graph = bench_utils::read_network_graph(&logger).unwrap();
+               let mut params = ProbabilisticScoringFeeParameters::default();
+               params.linear_success_probability = false;
+               let scorer = ProbabilisticScorer::new(
+                       ProbabilisticScoringDecayParameters::default(), &network_graph, &logger);
+               generate_routes(bench, &network_graph, scorer, &params,
+                       channelmanager::provided_invoice_features(&UserConfig::default()), 0,
+                       "generate_mpp_routes_with_nonlinear_probabilistic_scorer");
+       }
+
+       pub fn generate_large_mpp_routes_with_nonlinear_probabilistic_scorer(bench: &mut Criterion) {
+               let logger = TestLogger::new();
+               let network_graph = bench_utils::read_network_graph(&logger).unwrap();
+               let mut params = ProbabilisticScoringFeeParameters::default();
+               params.linear_success_probability = false;
+               let scorer = ProbabilisticScorer::new(
+                       ProbabilisticScoringDecayParameters::default(), &network_graph, &logger);
+               generate_routes(bench, &network_graph, scorer, &params,
+                       channelmanager::provided_invoice_features(&UserConfig::default()), 100_000_000,
+                       "generate_large_mpp_routes_with_nonlinear_probabilistic_scorer");
+       }
+
        fn generate_routes<S: ScoreLookUp + ScoreUpdate>(
                bench: &mut Criterion, graph: &NetworkGraph<&TestLogger>, mut scorer: S,
                score_params: &S::ScoreParams, features: Bolt11InvoiceFeatures, starting_amount: u64,