From 4b1e4d5477815e90a60b81be7b13b940296a1bb2 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Wed, 7 Feb 2024 13:15:20 +0100 Subject: [PATCH] f Account for `DefaultRouter` taking an `EntropySource` --- src/builder.rs | 2 +- src/types.rs | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/builder.rs b/src/builder.rs index 072b6e85e..42097c192 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -599,7 +599,7 @@ fn build_with_store_internal( let router = Arc::new(DefaultRouter::new( Arc::clone(&network_graph), Arc::clone(&logger), - keys_manager.get_secure_random_bytes(), + Arc::clone(&keys_manager), Arc::clone(&scorer), scoring_fee_params, )); diff --git a/src/types.rs b/src/types.rs index 522dd28fd..6057e6a33 100644 --- a/src/types.rs +++ b/src/types.rs @@ -11,7 +11,7 @@ use lightning::ln::ChannelId; use lightning::routing::gossip; use lightning::routing::router::DefaultRouter; use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters}; -use lightning::sign::{EntropySource, InMemorySigner}; +use lightning::sign::InMemorySigner; use lightning::util::config::ChannelConfig as LdkChannelConfig; use lightning::util::config::MaxDustHTLCExposure as LdkMaxDustHTLCExposure; use lightning::util::ser::{Readable, Writeable, Writer}; @@ -74,6 +74,7 @@ pub(crate) type KeysManager = crate::wallet::WalletKeysManager< pub(crate) type Router = DefaultRouter< Arc, Arc, + Arc, Arc>, ProbabilisticScoringFeeParameters, Scorer, @@ -118,12 +119,8 @@ impl lightning::onion_message::messenger::MessageRouter for FakeMessageRouter { ) -> Result { unimplemented!() } - fn create_blinded_paths< - ES: EntropySource + ?Sized, - T: secp256k1::Signing + secp256k1::Verification, - >( - &self, _recipient: PublicKey, _peers: Vec, _entropy_source: &ES, - _secp_ctx: &Secp256k1, + fn create_blinded_paths( + &self, _recipient: PublicKey, _peers: Vec, _secp_ctx: &Secp256k1, ) -> Result, ()> { unreachable!() }