Merge pull request #1694 from jurvis/jurvis/2022-08-move-scorer-from-router

Move `LockableScore` requirement away from `Router` trait

diff --cc lightning-background-processor/src/lib.rs
Simple merge

diff --cc lightning-invoice/Cargo.toml
Simple merge

diff --cc lightning-invoice/src/payment.rs
index b9f4486339d199dbdc3d93f09cad652a64fe335c,0d99041ad9e854207dc802f8a96b187d8ac3995f..21d7def4a51e9feadac7b4e6c7488b5714f98409
--- 1/lightning-invoice/src/payment.rs
--- 2/lightning-invoice/src/payment.rs
+++ b/lightning-invoice/src/payment.rs
@@@ -777,11 -761,10 +761,11 @@@ impl lightning::util::ser::Readable fo
  mod tests {
        use super::*;
        use crate::{InvoiceBuilder, Currency};
-       use utils::create_invoice_from_channelmanager_and_duration_since_epoch;
+       use utils::{ScorerAccountingForInFlightHtlcs, create_invoice_from_channelmanager_and_duration_since_epoch};
        use bitcoin_hashes::sha256::Hash as Sha256;
        use lightning::ln::PaymentPreimage;
 -      use lightning::ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
 +      use lightning::ln::channelmanager;
 +      use lightning::ln::features::{ChannelFeatures, NodeFeatures};
        use lightning::ln::functional_test_utils::*;
        use lightning::ln::msgs::{ChannelMessageHandler, ErrorAction, LightningError};
        use lightning::routing::gossip::{EffectiveCapacity, NodeId};

diff --cc lightning-invoice/src/utils.rs
Simple merge