Clean up some send_payment_with_route call rustfmt verticality

`rustfmt` loves to make expressions vertical by putting each method
parameter on its own line. In cases where each method parameter is
actually doing something, this can be fine, but in some cases we
have a few method parameters that are straightforward and shouldn't
be the readers focus, mixed with one or two parameters which are
key.

Here, we clean up a regular instance of this in calls to
`send_payment_with_route` in `priv_short_conf_tests.rs` and
`shutdown_tests.rs`. In these tests, the fact that we're sending a
payment along a route picked on a previous line is important, but
the specific parameters of the payment are not. Thus, condensing
the calls onto a single line by breaking out some parameters into
variables enables the reader to more easily skim past useless
details.

Author: TheBlueMatt

lightning/src/ln/priv_short_conf_tests.rs

@@ -79,14 +79,11 @@ fn test_priv_forwarding_rejection() {
 	let (route, our_payment_hash, our_payment_preimage, our_payment_secret) =
 		get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 10_000);
 
+	let onion = RecipientOnionFields::secret_only(our_payment_secret);
+	let id = PaymentId(our_payment_hash.0);
 	nodes[0]
 		.node
-		.send_payment_with_route(
-			route.clone(),
-			our_payment_hash,
-			RecipientOnionFields::secret_only(our_payment_secret),
-			PaymentId(our_payment_hash.0),
-		)
+		.send_payment_with_route(route.clone(), our_payment_hash, onion, id)
 		.unwrap();
 	check_added_monitors!(nodes[0], 1);
 	let payment_event =
@@ -199,15 +196,9 @@ fn test_priv_forwarding_rejection() {
 	get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, node_c_id);
 	get_event_msg!(nodes[2], MessageSendEvent::SendChannelUpdate, node_b_id);
 
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route,
-			our_payment_hash,
-			RecipientOnionFields::secret_only(our_payment_secret),
-			PaymentId(our_payment_hash.0),
-		)
-		.unwrap();
+	let onion = RecipientOnionFields::secret_only(our_payment_secret);
+	let id = PaymentId(our_payment_hash.0);
+	nodes[0].node.send_payment_with_route(route, our_payment_hash, onion, id).unwrap();
 	check_added_monitors!(nodes[0], 1);
 	pass_along_route(
 		&nodes[0],
@@ -388,15 +379,10 @@ fn test_routed_scid_alias() {
 	let (route, payment_hash, payment_preimage, payment_secret) =
 		get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000);
 	assert_eq!(route.paths[0].hops[1].short_channel_id, last_hop[0].inbound_scid_alias.unwrap());
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route,
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0),
-		)
-		.unwrap();
+
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let id = PaymentId(payment_hash.0);
+	nodes[0].node.send_payment_with_route(route, payment_hash, onion, id).unwrap();
 	check_added_monitors!(nodes[0], 1);
 
 	pass_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], 100_000, payment_hash, payment_secret);
@@ -623,15 +609,10 @@ fn test_inbound_scid_privacy() {
 	let (route, payment_hash, payment_preimage, payment_secret) =
 		get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 100_000);
 	assert_eq!(route.paths[0].hops[1].short_channel_id, last_hop[0].inbound_scid_alias.unwrap());
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route,
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0),
-		)
-		.unwrap();
+
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let id = PaymentId(payment_hash.0);
+	nodes[0].node.send_payment_with_route(route, payment_hash, onion, id).unwrap();
 	check_added_monitors!(nodes[0], 1);
 
 	pass_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], 100_000, payment_hash, payment_secret);
@@ -649,15 +630,10 @@ fn test_inbound_scid_privacy() {
 	let (route_2, payment_hash_2, _, payment_secret_2) =
 		get_route_and_payment_hash!(nodes[0], nodes[2], payment_params_2, 100_000);
 	assert_eq!(route_2.paths[0].hops[1].short_channel_id, last_hop[0].short_channel_id.unwrap());
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route_2,
-			payment_hash_2,
-			RecipientOnionFields::secret_only(payment_secret_2),
-			PaymentId(payment_hash_2.0),
-		)
-		.unwrap();
+
+	let onion = RecipientOnionFields::secret_only(payment_secret_2);
+	let id = PaymentId(payment_hash_2.0);
+	nodes[0].node.send_payment_with_route(route_2, payment_hash_2, onion, id).unwrap();
 	check_added_monitors!(nodes[0], 1);
 
 	let payment_event = SendEvent::from_node(&nodes[0]);
@@ -751,15 +727,10 @@ fn test_scid_alias_returned() {
 	route.paths[0].hops[1].fee_msat = 10_000_000; // Overshoot the last channel's value
 
 	// Route the HTLC through to the destination.
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route.clone(),
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0),
-		)
-		.unwrap();
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let id = PaymentId(payment_hash.0);
+	nodes[0].node.send_payment_with_route(route.clone(), payment_hash, onion, id).unwrap();
+
 	check_added_monitors!(nodes[0], 1);
 	let as_updates = get_htlc_update_msgs!(nodes[0], node_b_id);
 	nodes[1].node.handle_update_add_htlc(node_a_id, &as_updates.update_add_htlcs[0]);
@@ -794,15 +765,10 @@ fn test_scid_alias_returned() {
 	route.paths[0].hops[0].fee_msat = 0; // But set fee paid to the middle hop to 0
 
 	// Route the HTLC through to the destination.
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route,
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0),
-		)
-		.unwrap();
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let id = PaymentId(payment_hash.0);
+	nodes[0].node.send_payment_with_route(route, payment_hash, onion, id).unwrap();
+
 	check_added_monitors!(nodes[0], 1);
 	let as_updates = get_htlc_update_msgs!(nodes[0], node_b_id);
 	nodes[1].node.handle_update_add_htlc(node_a_id, &as_updates.update_add_htlcs[0]);
@@ -1003,15 +969,9 @@ fn test_0conf_channel_with_async_monitor() {
 	let (route, payment_hash, payment_preimage, payment_secret) =
 		get_route_and_payment_hash!(nodes[0], nodes[2], 1_000_000);
 
-	nodes[0]
-		.node
-		.send_payment_with_route(
-			route,
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0),
-		)
-		.unwrap();
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let id = PaymentId(payment_hash.0);
+	nodes[0].node.send_payment_with_route(route, payment_hash, onion, id).unwrap();
 	check_added_monitors!(nodes[0], 1);
 
 	let as_send = SendEvent::from_node(&nodes[0]);

lightning/src/ln/shutdown_tests.rs

@@ -441,30 +441,15 @@ fn updates_shutdown_wait() {
 		&random_seed_bytes,
 	)
 	.unwrap();
-	unwrap_send_err!(
-		nodes[0],
-		nodes[0].node.send_payment_with_route(
-			route_1,
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0)
-		),
-		true,
-		APIError::ChannelUnavailable { .. },
-		{}
-	);
-	unwrap_send_err!(
-		nodes[1],
-		nodes[1].node.send_payment_with_route(
-			route_2,
-			payment_hash,
-			RecipientOnionFields::secret_only(payment_secret),
-			PaymentId(payment_hash.0)
-		),
-		true,
-		APIError::ChannelUnavailable { .. },
-		{}
-	);
+
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let id = PaymentId(payment_hash.0);
+	let res = nodes[0].node.send_payment_with_route(route_1, payment_hash, onion, id);
+	unwrap_send_err!(nodes[0], res, true, APIError::ChannelUnavailable { .. }, {});
+
+	let onion = RecipientOnionFields::secret_only(payment_secret);
+	let res = nodes[1].node.send_payment_with_route(route_2, payment_hash, onion, id);
+	unwrap_send_err!(nodes[1], res, true, APIError::ChannelUnavailable { .. }, {});
 
 	nodes[2].node.claim_funds(payment_preimage_0);
 	check_added_monitors!(nodes[2], 1);
@@ -558,15 +543,11 @@ fn do_htlc_fail_async_shutdown(blinded_recipient: bool) {
 			amt_msat,
 		)
 	};
+	let onion = RecipientOnionFields::secret_only(our_payment_secret);
+	let id = PaymentId(our_payment_hash.0);
 	nodes[0]
 		.node
-		.send_payment(
-			our_payment_hash,
-			RecipientOnionFields::secret_only(our_payment_secret),
-			PaymentId(our_payment_hash.0),
-			route_params,
-			Retry::Attempts(0),
-		)
+		.send_payment( our_payment_hash, onion, id, route_params, Retry::Attempts(0))
 		.unwrap();
 	check_added_monitors!(nodes[0], 1);
 	let updates = get_htlc_update_msgs!(nodes[0], node_b_id);