f fmt

Author: TheBlueMatt

lightning/src/routing/router.rs

@@ -9053,7 +9053,7 @@ mod tests {
 		let random_seed_bytes = [42; 32];
 
 		// Enable channel 1
-		update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
+		let update_1 = UnsignedChannelUpdate {
 			chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 			short_channel_id: 1,
 			timestamp: 2,
@@ -9064,11 +9064,12 @@ mod tests {
 			htlc_maximum_msat: 10_000_000,
 			fee_base_msat: 0,
 			fee_proportional_millionths: 0,
-			excess_data: Vec::new()
-		});
+			excess_data: Vec::new(),
+		};
+		update_channel(&gossip_sync, &secp_ctx, &our_privkey, update_1);
 
 		// Set the fee on channel 3 to 1 sat, max HTLC to 1M msat
-		update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
+		let update_3 = UnsignedChannelUpdate {
 			chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 			short_channel_id: 3,
 			timestamp: 2,
@@ -9079,11 +9080,12 @@ mod tests {
 			htlc_maximum_msat: 1_000_000,
 			fee_base_msat: 1_000,
 			fee_proportional_millionths: 0,
-			excess_data: Vec::new()
-		});
+			excess_data: Vec::new(),
+		};
+		update_channel(&gossip_sync, &secp_ctx, &privkeys[0], update_3);
 
 		// Set the fee on channel 13 to 1 sat, max HTLC to 1M msat
-		update_channel(&gossip_sync, &secp_ctx, &privkeys[7], UnsignedChannelUpdate {
+		let update_13 = UnsignedChannelUpdate {
 			chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 			short_channel_id: 13,
 			timestamp: 2,
@@ -9094,11 +9096,12 @@ mod tests {
 			htlc_maximum_msat: 1_000_000,
 			fee_base_msat: 1_000,
 			fee_proportional_millionths: 0,
-			excess_data: Vec::new()
-		});
+			excess_data: Vec::new(),
+		};
+		update_channel(&gossip_sync, &secp_ctx, &privkeys[7], update_13);
 
 		// Set the fee on channel 4 to 1 sat, max HTLC to 1M msat
-		update_channel(&gossip_sync, &secp_ctx, &privkeys[1], UnsignedChannelUpdate {
+		let update_4 = UnsignedChannelUpdate {
 			chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 			short_channel_id: 4,
 			timestamp: 2,
@@ -9109,8 +9112,9 @@ mod tests {
 			htlc_maximum_msat: 1_000_000,
 			fee_base_msat: 1_000,
 			fee_proportional_millionths: 0,
-			excess_data: Vec::new()
-		});
+			excess_data: Vec::new(),
+		};
+		update_channel(&gossip_sync, &secp_ctx, &privkeys[1], update_4);
 
 		// The router will attempt to gather 3x the requested amount, and if it finds the new path
 		// through channel 16, added below, it'll always prefer that, even prior to the changes
@@ -9120,10 +9124,11 @@ mod tests {
 		for i in 0..6 {
 			// Finally, create a single channel with fee of 2 sat from node 1 to node 2 which allows
 			// for a larger payment.
-			add_channel(&gossip_sync, &secp_ctx, &privkeys[7], &privkeys[2], ChannelFeatures::from_le_bytes(vec![]), i + 42);
+			let chan_features = ChannelFeatures::from_le_bytes(vec![]);
+			add_channel(&gossip_sync, &secp_ctx, &privkeys[7], &privkeys[2], chan_features, i + 42);
 
 			// Set the fee on channel 16 to 2 sats, max HTLC to 3M msat
-			update_channel(&gossip_sync, &secp_ctx, &privkeys[7], UnsignedChannelUpdate {
+			let update_a = UnsignedChannelUpdate {
 				chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 				short_channel_id: i + 42,
 				timestamp: 2,
@@ -9134,11 +9139,12 @@ mod tests {
 				htlc_maximum_msat: 1_000_000,
 				fee_base_msat: 1_000,
 				fee_proportional_millionths: 0,
-				excess_data: Vec::new()
-			});
+				excess_data: Vec::new(),
+			};
+			update_channel(&gossip_sync, &secp_ctx, &privkeys[7], update_a);
 
 			// Enable channel 16 by providing an update in both directions
-			update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
+			let update_b = UnsignedChannelUpdate {
 				chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 				short_channel_id: i + 42,
 				timestamp: 2,
@@ -9149,8 +9155,9 @@ mod tests {
 				htlc_maximum_msat: 10_000_000,
 				fee_base_msat: u32::MAX,
 				fee_proportional_millionths: 0,
-				excess_data: Vec::new()
-			});
+				excess_data: Vec::new(),
+			};
+			update_channel(&gossip_sync, &secp_ctx, &privkeys[2], update_b);
 		}
 
 		// Ensure that we can build a route for 3M msat across the three paths to node 2.
@@ -9159,20 +9166,31 @@ mod tests {
 			.with_bolt11_features(channelmanager::provided_bolt11_invoice_features(&config))
 			.unwrap();
 		payment_params.max_channel_saturation_power_of_half = 0;
-		let route_params = RouteParameters::from_payment_params_and_value(payment_params, 3_000_000);
-		let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-			Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
+		let route_params =
+			RouteParameters::from_payment_params_and_value(payment_params, 3_000_000);
+		let route = get_route(
+			&our_id,
+			&route_params,
+			&network_graph.read_only(),
+			None,
+			Arc::clone(&logger),
+			&scorer,
+			&Default::default(),
+			&random_seed_bytes,
+		)
+		.unwrap();
 		assert_eq!(route.paths.len(), 3);
 		for path in route.paths {
 			assert_eq!(path.hops.len(), 2);
 		}
 
 		// Finally, create a single channel with fee of 2 sat from node 1 to node 2 which allows
 		// for a larger payment.
-		add_channel(&gossip_sync, &secp_ctx, &privkeys[1], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(16)), 16);
+		let features_16 = ChannelFeatures::from_le_bytes(id_to_feature_flags(16));
+		add_channel(&gossip_sync, &secp_ctx, &privkeys[1], &privkeys[2], features_16, 16);
 
 		// Set the fee on channel 16 to 2 sats, max HTLC to 3M msat
-		update_channel(&gossip_sync, &secp_ctx, &privkeys[1], UnsignedChannelUpdate {
+		let update_16_a = UnsignedChannelUpdate {
 			chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 			short_channel_id: 16,
 			timestamp: 2,
@@ -9183,11 +9201,12 @@ mod tests {
 			htlc_maximum_msat: 3_000_000,
 			fee_base_msat: 2_000,
 			fee_proportional_millionths: 0,
-			excess_data: Vec::new()
-		});
+			excess_data: Vec::new(),
+		};
+		update_channel(&gossip_sync, &secp_ctx, &privkeys[1], update_16_a);
 
 		// Enable channel 16 by providing an update in both directions
-		update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
+		let update_16_b = UnsignedChannelUpdate {
 			chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 			short_channel_id: 16,
 			timestamp: 2,
@@ -9198,12 +9217,22 @@ mod tests {
 			htlc_maximum_msat: 10_000_000,
 			fee_base_msat: u32::MAX,
 			fee_proportional_millionths: 0,
-			excess_data: Vec::new()
-		});
+			excess_data: Vec::new(),
+		};
+		update_channel(&gossip_sync, &secp_ctx, &privkeys[2], update_16_b);
 
 		// Ensure that we now build a route for 3M msat across just the new path
-		let route = get_route(&our_id, &route_params, &network_graph.read_only(), None,
-			Arc::clone(&logger), &scorer, &Default::default(), &random_seed_bytes).unwrap();
+		let route = get_route(
+			&our_id,
+			&route_params,
+			&network_graph.read_only(),
+			None,
+			Arc::clone(&logger),
+			&scorer,
+			&Default::default(),
+			&random_seed_bytes,
+		)
+		.unwrap();
 		assert_eq!(route.paths.len(), 1);
 		assert_eq!(route.paths[0].hops.len(), 2);
 		assert_eq!(route.paths[0].hops[1].short_channel_id, 16);