f clean up node skipping variables

Author: TheBlueMatt

lightning/src/routing/router.rs

@@ -748,9 +748,9 @@ pub fn get_route<L: Deref>(our_node_id: &PublicKey, network: &NetworkGraph, paye
 	macro_rules! add_entries_to_cheapest_to_target_node {
 		( $node: expr, $node_id: expr, $fee_to_target_msat: expr, $next_hops_value_contribution: expr, $incl_fee_next_hops_htlc_minimum_msat: expr ) => {
 			let skip_node = if let Some(elem) = dist.get_mut($node_id) {
-				let v = elem.was_processed;
+				let was_processed = elem.was_processed;
 				elem.was_processed = true;
-				v
+				was_processed
 			} else {
 				// Entries are added to dist in add_entry!() when there is a channel from a node.
 				// Because there are no channels from payee, it will not have a dist entry at this point.
@@ -759,40 +759,41 @@ pub fn get_route<L: Deref>(our_node_id: &PublicKey, network: &NetworkGraph, paye
 				false
 			};
 
-			if !skip_node && first_hops.is_some() {
-				if let Some(&(ref first_hop, ref features, ref outbound_capacity_msat)) = first_hop_targets.get(&$node_id) {
-					add_entry!(first_hop, *our_node_id, $node_id, dummy_directional_info, Some(outbound_capacity_msat / 1000), features.to_context(), $fee_to_target_msat, $next_hops_value_contribution, $incl_fee_next_hops_htlc_minimum_msat);
+			if !skip_node {
+				if first_hops.is_some() {
+					if let Some(&(ref first_hop, ref features, ref outbound_capacity_msat)) = first_hop_targets.get(&$node_id) {
+						add_entry!(first_hop, *our_node_id, $node_id, dummy_directional_info, Some(outbound_capacity_msat / 1000), features.to_context(), $fee_to_target_msat, $next_hops_value_contribution, $incl_fee_next_hops_htlc_minimum_msat);
+					}
 				}
-			}
 
-			let features;
-			if let Some(node_info) = $node.announcement_info.as_ref() {
-				features = node_info.features.clone();
-			} else {
-				features = NodeFeatures::empty();
-			}
+				let features;
+				if let Some(node_info) = $node.announcement_info.as_ref() {
+					features = node_info.features.clone();
+				} else {
+					features = NodeFeatures::empty();
+				}
 
-			if !skip_node && !features.requires_unknown_bits() {
-				for chan_id in $node.channels.iter() {
-					let chan = network.get_channels().get(chan_id).unwrap();
-					if !chan.features.requires_unknown_bits() {
-						if chan.node_one == *$node_id {
-							// ie $node is one, ie next hop in A* is two, via the two_to_one channel
-							if first_hops.is_none() || chan.node_two != *our_node_id {
-								if let Some(two_to_one) = chan.two_to_one.as_ref() {
-									if two_to_one.enabled {
-										add_entry!(chan_id, chan.node_two, chan.node_one, two_to_one, chan.capacity_sats, chan.features, $fee_to_target_msat, $next_hops_value_contribution, $incl_fee_next_hops_htlc_minimum_msat);
+				if !features.requires_unknown_bits() {
+					for chan_id in $node.channels.iter() {
+						let chan = network.get_channels().get(chan_id).unwrap();
+						if !chan.features.requires_unknown_bits() {
+							if chan.node_one == *$node_id {
+								// ie $node is one, ie next hop in A* is two, via the two_to_one channel
+								if first_hops.is_none() || chan.node_two != *our_node_id {
+									if let Some(two_to_one) = chan.two_to_one.as_ref() {
+										if two_to_one.enabled {
+											add_entry!(chan_id, chan.node_two, chan.node_one, two_to_one, chan.capacity_sats, chan.features, $fee_to_target_msat, $next_hops_value_contribution, $incl_fee_next_hops_htlc_minimum_msat);
+										}
 									}
 								}
-							}
-						} else {
-							if first_hops.is_none() || chan.node_one != *our_node_id {
-								if let Some(one_to_two) = chan.one_to_two.as_ref() {
-									if one_to_two.enabled {
-										add_entry!(chan_id, chan.node_one, chan.node_two, one_to_two, chan.capacity_sats, chan.features, $fee_to_target_msat, $next_hops_value_contribution, $incl_fee_next_hops_htlc_minimum_msat);
+							} else {
+								if first_hops.is_none() || chan.node_one != *our_node_id {
+									if let Some(one_to_two) = chan.one_to_two.as_ref() {
+										if one_to_two.enabled {
+											add_entry!(chan_id, chan.node_one, chan.node_two, one_to_two, chan.capacity_sats, chan.features, $fee_to_target_msat, $next_hops_value_contribution, $incl_fee_next_hops_htlc_minimum_msat);
+										}
 									}
 								}
-
 							}
 						}
 					}