f Consider RouteHop::announced to avoid probing all the way

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -3541,18 +3541,20 @@ where
 		let mut res = Vec::new();
 
 		for mut path in route.paths {
-			// If the last hop was provided by route hint we assume it's not an announced channel.
-			// If furthermore only a single route hint is provided we refrain from probing through
-			// all the way to the end and instead probe up to the second-to-last channel.
-			if let Payee::Clear { node_id, ref route_hints, .. } = route_params.payment_params.payee {
-				if route_hints.len() == 1 {
-					if let Some(hint) = route_hints[0].0.iter().last() {
-						if let Some(last_path_hop) = path.hops.last() {
-							if last_path_hop.pubkey == node_id && last_path_hop.short_channel_id == hint.short_channel_id {
-								let final_value_msat = path.final_value_msat();
-								path.hops.pop();
-								if let Some(mut new_last) = path.hops.iter_mut().last() {
-									new_last.fee_msat += final_value_msat;
+			// If the last hop is not an announced channel, and only a single route hint was
+			// provided, we refrain from probing all the way through to the end and instead probe
+			// up to the second-to-last channel.
+			if let Some(last_path_hop) = path.hops.last() {
+				if !last_path_hop.announced {
+					if let Payee::Clear { node_id, ref route_hints, .. } = route_params.payment_params.payee {
+						if route_hints.len() == 1 {
+							if let Some(hint) = route_hints[0].0.iter().last() {
+								if last_path_hop.pubkey == node_id && last_path_hop.short_channel_id == hint.short_channel_id {
+									let final_value_msat = path.final_value_msat();
+									path.hops.pop();
+									if let Some(new_last) = path.hops.iter_mut().last() {
+										new_last.fee_msat += final_value_msat;
+									}
 								}
 							}
 						}