f Account for scoring params given seperately

Author: tnull

src/builder.rs

@@ -24,7 +24,9 @@ use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArg
 use lightning::ln::msgs::RoutingMessageHandler;
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
 use lightning::routing::router::DefaultRouter;
-use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
+use lightning::routing::scoring::{
+	ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters,
+};
 
 use lightning::util::config::UserConfig;
 use lightning::util::ser::ReadableArgs;
@@ -494,7 +496,7 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 		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),
@@ -506,11 +508,13 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 		}
 	};
 
+	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/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};
@@ -161,7 +161,7 @@ pub(crate) fn read_scorer<
 where
 	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.clone());
 	ProbabilisticScorer::read(&mut reader, args).map_err(|e| {

src/types.rs

@@ -8,7 +8,7 @@ use lightning::ln::msgs::RoutingMessageHandler;
 use lightning::ln::peer_handler::IgnoringMessageHandler;
 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_net_tokio::SocketDescriptor;
@@ -56,8 +56,13 @@ pub(crate) type ChannelManager<K> = lightning::ln::channelmanager::ChannelManage
 pub(crate) type KeysManager =
 	WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>;
 
-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>>;