f Account for scoring params given seperately

Author: tnull

src/io/utils.rs

@@ -7,7 +7,7 @@ use crate::{Error, EventQueue, PaymentDetails};
 
 use lightning::chain::channelmonitor::ChannelMonitor;
 use lightning::routing::gossip::NetworkGraph;
-use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringDecayParameters};
 use lightning::sign::{EntropySource, SignerProvider};
 use lightning::util::logger::Logger;
 use lightning::util::ser::{Readable, ReadableArgs, Writeable};
@@ -115,7 +115,7 @@ where
 	K::Target: KVStore,
 	L::Target: Logger,
 {
-	let params = ProbabilisticScoringParameters::default();
+	let params = ProbabilisticScoringDecayParameters::default();
 	let mut reader = kv_store.read(SCORER_PERSISTENCE_NAMESPACE, SCORER_PERSISTENCE_KEY)?;
 	let args = (params, network_graph, logger);
 	let scorer = ProbabilisticScorer::read(&mut reader, args).map_err(|_| {

src/lib.rs

@@ -121,7 +121,9 @@ use lightning::ln::channelmanager::{
 };
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
 use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
-use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
+use lightning::routing::scoring::{
+	ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters,
+};
 use lightning::sign::EntropySource;
 
 use lightning::util::config::{ChannelHandshakeConfig, ChannelHandshakeLimits, UserConfig};
@@ -434,7 +436,7 @@ impl Builder {
 			Ok(scorer) => Arc::new(Mutex::new(scorer)),
 			Err(e) => {
 				if e.kind() == std::io::ErrorKind::NotFound {
-					let params = ProbabilisticScoringParameters::default();
+					let params = ProbabilisticScoringDecayParameters::default();
 					Arc::new(Mutex::new(ProbabilisticScorer::new(
 						params,
 						Arc::clone(&network_graph),
@@ -447,11 +449,13 @@ impl Builder {
 			}
 		};
 
+		let scoring_fee_params = ProbabilisticScoringFeeParameters::default();
 		let router = Arc::new(DefaultRouter::new(
 			Arc::clone(&network_graph),
 			Arc::clone(&logger),
 			keys_manager.get_secure_random_bytes(),
 			Arc::clone(&scorer),
+			scoring_fee_params,
 		));
 
 		// Read ChannelMonitor state from store

src/types.rs

@@ -13,7 +13,7 @@ use lightning::ln::peer_handler::IgnoringMessageHandler;
 use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::routing::gossip;
 use lightning::routing::router::DefaultRouter;
-use lightning::routing::scoring::ProbabilisticScorer;
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
 use lightning::sign::InMemorySigner;
 use lightning::util::ser::{Hostname, Readable, Writeable, Writer};
 use lightning_invoice::{Invoice, SignedRawInvoice};
@@ -64,8 +64,13 @@ pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
 
 pub(crate) type KeysManager = WalletKeysManager<bdk::database::SqliteDatabase>;
 
-pub(crate) type Router =
-	DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>, Arc<Mutex<Scorer>>>;
+pub(crate) type Router = DefaultRouter<
+	Arc<NetworkGraph>,
+	Arc<FilesystemLogger>,
+	Arc<Mutex<Scorer>>,
+	ProbabilisticScoringFeeParameters,
+	Scorer,
+>;
 pub(crate) type Scorer = ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
 
 pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;