Also sort by a PaymentPaths scoring.

Author: tnull

lightning/src/routing/router.rs

@@ -495,6 +495,13 @@ impl<'a> PaymentPath<'a> {
 		self.hops.last().unwrap().0.fee_msat
 	}
 
+	fn get_path_penalty_msat(&self) -> u64 {
+		if self.hops.len() < 1 {
+			return u64::max_value();
+		}
+		self.hops.first().unwrap().0.path_penalty_msat
+	}
+
 	fn get_total_fee_paid_msat(&self) -> u64 {
 		if self.hops.len() < 1 {
 			return 0;
@@ -1483,7 +1490,8 @@ where L::Target: Logger {
 				cur_route.sort_unstable_by(|a, b| {
 					a.get_value_msat().cmp(&b.get_value_msat())
 						// Reverse ordering for fees, so we drop higher-fee paths first
-						.then_with(|| b.get_total_fee_paid_msat().cmp(&a.get_total_fee_paid_msat()))
+						.then_with(|| b.get_total_fee_paid_msat().saturating_add(b.get_path_penalty_msat())
+							.cmp(&a.get_total_fee_paid_msat().saturating_add(a.get_path_penalty_msat())))
 				});
 
 				// We should make sure that at least 1 path left.