f rebase

Author: TheBlueMatt

lightning-invoice/src/payment.rs

@@ -1178,8 +1178,8 @@ mod tests {
 	// *** Full Featured Functional Tests with a Real ChannelManager ***
 	struct ManualRouter(Mutex<LinkedList<Result<Route, LightningError>>>);
 
-	impl Router for ManualRouter {
-		fn find_route(&self, _payer: &PublicKey, _params: &RouteParameters, _first_hops: Option<&[&ChannelDetails]>)
+	impl<S: routing::Score> Router<S> for ManualRouter {
+		fn find_route(&self, _payer: &PublicKey, _params: &RouteParameters, _first_hops: Option<&[&ChannelDetails]>, _scorer: &S)
 		-> Result<Route, LightningError> {
 			self.0.lock().unwrap().pop_front().unwrap()
 		}
@@ -1236,7 +1236,8 @@ mod tests {
 
 		let event_handled = core::cell::RefCell::new(false);
 		let event_handler = |_: &_| { *event_handled.borrow_mut() = true; };
-		let invoice_payer = InvoicePayer::new(nodes[0].node, route_res, nodes[0].logger, event_handler, RetryAttempts(1));
+		let scorer = RefCell::new(TestScorer::new());
+		let invoice_payer = InvoicePayer::new(nodes[0].node, route_res, &scorer, nodes[0].logger, event_handler, RetryAttempts(1));
 
 		invoice_payer.pay_invoice(&create_invoice_from_channelmanager(
 			&nodes[1].node, nodes[1].keys_manager, Currency::Bitcoin, Some(100_010_000), "Invoice".to_string()).unwrap()).unwrap();