From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Fri, 16 Sep 2022 19:01:38 +0000 (-0500)
Subject: Merge pull request #1694 from jurvis/jurvis/2022-08-move-scorer-from-router
X-Git-Tag: v0.0.112~35
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ca76d0675b5e3b123a92e19937d2f64b91355773;p=rust-lightning

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

Move `LockableScore` requirement away from `Router` trait
---

ca76d0675b5e3b123a92e19937d2f64b91355773
diff --cc lightning-invoice/src/payment.rs
index b9f448633,0d99041ad..21d7def4a
--- a/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};