Fix nits and indentation.

Author: tnull

lightning/src/routing/router.rs

@@ -876,8 +876,8 @@ where L::Target: Logger {
 		// since that value has to be transferred over this channel.
 		// Returns whether this channel caused an update to `targets`.
 		( $candidate: expr, $src_node_id: expr, $dest_node_id: expr, $next_hops_fee_msat: expr,
-		   $next_hops_value_contribution: expr, $next_hops_path_htlc_minimum_msat: expr,
-		   $next_hops_path_penalty_msat: expr, $next_hops_cltv_delta: expr, $next_hops_path_length: expr ) => { {
+			$next_hops_value_contribution: expr, $next_hops_path_htlc_minimum_msat: expr,
+			$next_hops_path_penalty_msat: expr, $next_hops_cltv_delta: expr, $next_hops_path_length: expr ) => { {
 			// We "return" whether we updated the path at the end, via this:
 			let mut did_add_update_path_to_src_node = false;
 			// Channels to self should not be used. This is more of belt-and-suspenders, because in
@@ -1163,9 +1163,9 @@ where L::Target: Logger {
 					for details in first_channels {
 						let candidate = CandidateRouteHop::FirstHop { details };
 						add_entry!(candidate, our_node_id, $node_id, $fee_to_target_msat,
-								   $next_hops_value_contribution,
-								   $next_hops_path_htlc_minimum_msat, $next_hops_path_penalty_msat,
-								   $next_hops_cltv_delta, $next_hops_path_length);
+							$next_hops_value_contribution,
+							$next_hops_path_htlc_minimum_msat, $next_hops_path_penalty_msat,
+							$next_hops_cltv_delta, $next_hops_path_length);
 					}
 				}
 
@@ -1189,11 +1189,11 @@ where L::Target: Logger {
 											short_channel_id: *chan_id,
 										};
 										add_entry!(candidate, *source, $node_id,
-												   $fee_to_target_msat,
-												   $next_hops_value_contribution,
-												   $next_hops_path_htlc_minimum_msat,
-												   $next_hops_path_penalty_msat,
-												   $next_hops_cltv_delta, $next_hops_path_length);
+											$fee_to_target_msat,
+											$next_hops_value_contribution,
+											$next_hops_path_htlc_minimum_msat,
+											$next_hops_path_penalty_msat,
+											$next_hops_cltv_delta, $next_hops_path_length);
 									}
 								}
 							}
@@ -1221,9 +1221,9 @@ where L::Target: Logger {
 			for details in first_channels {
 				let candidate = CandidateRouteHop::FirstHop { details };
 				let added = add_entry!(candidate, our_node_id, payee_node_id, 0, path_value_msat,
-									   0, 0u64, 0, 0);
+									0, 0u64, 0, 0);
 				log_trace!(logger, "{} direct route to payee via SCID {}",
-						   if added { "Added" } else { "Skipped" }, candidate.short_channel_id());
+						if added { "Added" } else { "Skipped" }, candidate.short_channel_id());
 			}
 		}
 
@@ -1293,9 +1293,8 @@ where L::Target: Logger {
 								aggregate_next_hops_path_penalty_msat,
 								aggregate_next_hops_cltv_delta, aggregate_next_hops_path_length) {
 						// If this hop was not used then there is no use checking the preceding
-						// hops
-						// in the RouteHint. We can break by just searching for a direct channel between
-						// last checked hop and first_hop_targets
+						// hops in the RouteHint. We can break by just searching for a direct
+						// channel between last checked hop and first_hop_targets.
 						hop_used = false;
 					}
 
@@ -1304,10 +1303,10 @@ where L::Target: Logger {
 						for details in first_channels {
 							let candidate = CandidateRouteHop::FirstHop { details };
 							add_entry!(candidate, our_node_id, NodeId::from_pubkey(&prev_hop_id),
-							aggregate_next_hops_fee_msat, path_value_msat,
-							aggregate_next_hops_path_htlc_minimum_msat,
-							aggregate_next_hops_path_penalty_msat, aggregate_next_hops_cltv_delta,
-							aggregate_next_hops_path_length);
+								aggregate_next_hops_fee_msat, path_value_msat,
+								aggregate_next_hops_path_htlc_minimum_msat,
+								aggregate_next_hops_path_penalty_msat, aggregate_next_hops_cltv_delta,
+								aggregate_next_hops_path_length);
 						}
 					}
 
@@ -1344,12 +1343,12 @@ where L::Target: Logger {
 							for details in first_channels {
 								let candidate = CandidateRouteHop::FirstHop { details };
 								add_entry!(candidate, our_node_id,
-										   NodeId::from_pubkey(&hop.src_node_id),
-										   aggregate_next_hops_fee_msat, path_value_msat,
-										   aggregate_next_hops_path_htlc_minimum_msat,
-										   aggregate_next_hops_path_penalty_msat,
-										   aggregate_next_hops_cltv_delta,
-										   aggregate_next_hops_path_length);
+									NodeId::from_pubkey(&hop.src_node_id),
+									aggregate_next_hops_fee_msat, path_value_msat,
+									aggregate_next_hops_path_htlc_minimum_msat,
+									aggregate_next_hops_path_penalty_msat,
+									aggregate_next_hops_cltv_delta,
+									aggregate_next_hops_path_length);
 							}
 						}
 					}
@@ -1758,7 +1757,7 @@ mod tests {
 	use chain::keysinterface::KeysInterface;
 	use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
 	use ln::msgs::{ErrorAction, LightningError, OptionalField, UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingMessageHandler,
-	   NodeAnnouncement, UnsignedNodeAnnouncement, ChannelUpdate, UnsignedChannelUpdate};
+		NodeAnnouncement, UnsignedNodeAnnouncement, ChannelUpdate, UnsignedChannelUpdate};
 	use ln::channelmanager;
 	use util::test_utils;
 	use util::chacha20::ChaCha20;