f - Move routing::Score parameterization from find_route to Router

Author: jkczyz

lightning-invoice/src/payment.rs

@@ -59,8 +59,8 @@
 //! # }
 //! #
 //! # struct FakeRouter {};
-//! # impl Router for FakeRouter {
-//! #     fn find_route<S: routing::Score>(
+//! # impl<S: routing::Score> Router<S> for FakeRouter {
+//! #     fn find_route(
 //! #         &self, payer: &PublicKey, params: &RouteParameters,
 //! #         first_hops: Option<&[&ChannelDetails]>, scorer: &S
 //! #     ) -> Result<Route, LightningError> { unimplemented!() }
@@ -134,7 +134,7 @@ use std::time::{Duration, SystemTime};
 pub struct InvoicePayer<P: Deref, R, S: Deref, L: Deref, E>
 where
 	P::Target: Payer,
-	R: Router,
+	R: for <'a> Router<<<S as Deref>::Target as routing::LockableScore<'a>>::Locked>,
 	S::Target: for <'a> routing::LockableScore<'a>,
 	L::Target: Logger,
 	E: EventHandler,
@@ -166,9 +166,9 @@ pub trait Payer {
 }
 
 /// A trait defining behavior for routing an [`Invoice`] payment.
-pub trait Router {
+pub trait Router<S: routing::Score> {
 	/// Finds a [`Route`] between `payer` and `payee` for a payment with the given values.
-	fn find_route<S: routing::Score>(
+	fn find_route(
 		&self, payer: &PublicKey, params: &RouteParameters, first_hops: Option<&[&ChannelDetails]>,
 		scorer: &S
 	) -> Result<Route, LightningError>;
@@ -192,7 +192,7 @@ pub enum PaymentError {
 impl<P: Deref, R, S: Deref, L: Deref, E> InvoicePayer<P, R, S, L, E>
 where
 	P::Target: Payer,
-	R: Router,
+	R: for <'a> Router<<<S as Deref>::Target as routing::LockableScore<'a>>::Locked>,
 	S::Target: for <'a> routing::LockableScore<'a>,
 	L::Target: Logger,
 	E: EventHandler,
@@ -308,7 +308,7 @@ fn has_expired(params: &RouteParameters) -> bool {
 impl<P: Deref, R, S: Deref, L: Deref, E> EventHandler for InvoicePayer<P, R, S, L, E>
 where
 	P::Target: Payer,
-	R: Router,
+	R: for <'a> Router<<<S as Deref>::Target as routing::LockableScore<'a>>::Locked>,
 	S::Target: for <'a> routing::LockableScore<'a>,
 	L::Target: Logger,
 	E: EventHandler,
@@ -949,8 +949,8 @@ mod tests {
 		}
 	}
 
-	impl Router for TestRouter {
-		fn find_route<S: routing::Score>(
+	impl<S: routing::Score> Router<S> for TestRouter {
+		fn find_route(
 			&self,
 			_payer: &PublicKey,
 			params: &RouteParameters,
@@ -965,8 +965,8 @@ mod tests {
 
 	struct FailingRouter;
 
-	impl Router for FailingRouter {
-		fn find_route<S: routing::Score>(
+	impl<S: routing::Score> Router<S> for FailingRouter {
+		fn find_route(
 			&self,
 			_payer: &PublicKey,
 			_params: &RouteParameters,

lightning-invoice/src/utils.rs

@@ -109,9 +109,9 @@ impl<G, L: Deref> DefaultRouter<G, L> where G: Deref<Target = NetworkGraph>, L::
 	}
 }
 
-impl<G, L: Deref> Router for DefaultRouter<G, L>
+impl<G, L: Deref, S: routing::Score> Router<S> for DefaultRouter<G, L>
 where G: Deref<Target = NetworkGraph>, L::Target: Logger {
-	fn find_route<S: routing::Score>(
+	fn find_route(
 		&self, payer: &PublicKey, params: &RouteParameters, first_hops: Option<&[&ChannelDetails]>,
 		scorer: &S
 	) -> Result<Route, LightningError> {