Omit unnecessary copy, simplify.

Author: tnull

lightning/src/routing/router.rs

@@ -1566,11 +1566,9 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 
 		// Remember the last three nodes of the random walk and avoid looping back on them.
 		// Init with the last three nodes from the actual path, if possible.
-		let last_id = NodeId::from_pubkey(&path.last().unwrap().pubkey);
-		let second_last_id = NodeId::from_pubkey(&path.get(path.len().saturating_sub(2)).unwrap().pubkey);
-		let third_last_id = NodeId::from_pubkey(&path.get(path.len().saturating_sub(3)).unwrap().pubkey);
-		let mut nodes_to_avoid: [NodeId; 3] = [third_last_id, second_last_id, last_id];
-		let mut nodes_ring_index = 0;
+		let mut nodes_to_avoid: [NodeId; 3] = [NodeId::from_pubkey(&path.last().unwrap().pubkey),
+			NodeId::from_pubkey(&path.get(path.len().saturating_sub(2)).unwrap().pubkey),
+			NodeId::from_pubkey(&path.get(path.len().saturating_sub(3)).unwrap().pubkey)];
 
 		// Choose the last publicly known node as the starting point for the random walk.
 		let mut cur_hop: Option<NodeId> = None;
@@ -1589,7 +1587,7 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 		prng.process_in_place(&mut random_path_bytes);
 		let random_walk_length = usize::from_be_bytes(random_path_bytes).wrapping_rem(3).wrapping_add(1);
 
-		for _random_hop in 0..random_walk_length {
+		for random_hop in 0..random_walk_length {
 			// If we don't find a suitable offset in the public network graph, we default to
 			// MEDIAN_HOP_CLTV_EXPIRY_DELTA.
 			let mut random_hop_offset = MEDIAN_HOP_CLTV_EXPIRY_DELTA;
@@ -1604,8 +1602,7 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 						.and_then(|id| network_channels.get(id)) {
 							random_channel.as_directed_from(&cur_node_id).map(|(dir_info, next_id)| {
 								if !nodes_to_avoid.iter().any(|x| x == next_id) {
-									nodes_to_avoid[nodes_ring_index] = *next_id;
-									nodes_ring_index = (nodes_ring_index + 1) % 3;
+									nodes_to_avoid[random_hop] = *next_id;
 									dir_info.direction().map(|channel_update_info| {
 										random_hop_offset = channel_update_info.cltv_expiry_delta.into();
 										cur_hop = Some(*next_id);