Choose the last publicly known node as the starting point for the random walk.

Author: tnull

lightning/src/routing/router.rs

@@ -1520,14 +1520,13 @@ where L::Target: Logger {
 	for path in selected_paths.iter_mut() {
 		let mut shadow_ctlv_expiry_delta_offset: u32 = 0;
 
-		// Choose starting point for the random walk
-		let mut cur_node_id = if network_nodes.contains_key(&payee_node_id) {
-			payee_node_id 
-		} else {
-			assert_eq!(payee_node_id, NodeId::from_pubkey(&path.last().unwrap().as_ref().unwrap().pubkey));
-			assert!(path.len() > 1);
-			NodeId::from_pubkey(&path.iter().rev().next().unwrap().as_ref().unwrap().pubkey)
-		};
+		// Choose the last publicly known node as the starting point for the random walk
+		let mut cur_node_iter = path.iter().rev();
+		let mut cur_node_id = NodeId::from_pubkey(&cur_node_iter.next().unwrap().as_ref().unwrap().pubkey);
+		assert_eq!(cur_node_id, payee_node_id);
+		while !network_nodes.contains_key(&cur_node_id) {
+			cur_node_id = NodeId::from_pubkey(&cur_node_iter.next().unwrap().as_ref().unwrap().pubkey);
+		}
 
 		// Init PRNG
 		let mut path_nonce = [0u8; 8];