Remove previously deprecated `Scorer`

[rust-lightning] / lightning / src / routing / router.rs

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index 6c8f40017811363be882133ecb09e3aaa71338c2..5d4d4ac123818ca0cda313a4e768a4b479f8ff3d 100644 (file)
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -1917,7 +1917,7 @@ mod tests {
                        unspendable_punishment_reserve: None,
                        confirmations_required: None,
                        force_close_spend_delay: None,
-                       is_outbound: true, is_funding_locked: true,
+                       is_outbound: true, is_channel_ready: true,
                        is_usable: true, is_public: true,
                        inbound_htlc_minimum_msat: None,
                        inbound_htlc_maximum_msat: None,
@@ -5700,7 +5700,7 @@ mod benches {
        use chain::keysinterface::{KeysManager,KeysInterface};
        use ln::channelmanager::{ChannelCounterparty, ChannelDetails};
        use ln::features::{InitFeatures, InvoiceFeatures};
-       use routing::scoring::{FixedPenaltyScorer, ProbabilisticScorer, ProbabilisticScoringParameters, Scorer};
+       use routing::scoring::{FixedPenaltyScorer, ProbabilisticScorer, ProbabilisticScoringParameters};
        use util::logger::{Logger, Record};
        use util::test_utils::TestLogger;
 
@@ -5750,7 +5750,7 @@ mod benches {
                        confirmations_required: None,
                        force_close_spend_delay: None,
                        is_outbound: true,
-                       is_funding_locked: true,
+                       is_channel_ready: true,
                        is_usable: true,
                        is_public: true,
                        inbound_htlc_minimum_msat: None,
@@ -5772,20 +5772,6 @@ mod benches {
                generate_routes(bench, &network_graph, scorer, InvoiceFeatures::known());
        }
 
-       #[bench]
-       fn generate_routes_with_default_scorer(bench: &mut Bencher) {
-               let network_graph = read_network_graph();
-               let scorer = Scorer::default();
-               generate_routes(bench, &network_graph, scorer, InvoiceFeatures::empty());
-       }
-
-       #[bench]
-       fn generate_mpp_routes_with_default_scorer(bench: &mut Bencher) {
-               let network_graph = read_network_graph();
-               let scorer = Scorer::default();
-               generate_routes(bench, &network_graph, scorer, InvoiceFeatures::known());
-       }
-
        #[bench]
        fn generate_routes_with_probabilistic_scorer(bench: &mut Bencher) {
                let logger = TestLogger::new();