Clean up misc rustfmt verticality in tests

`rustfmt` loves to make expressions vertical by putting each method
parameter or `.` subexpression on its own line. In cases where each
method parameter or `.` subexpression 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 or a few subexpressions
which simply do rote variable indexing or locking.

Here we clean up various `rustfmt` verticality that exposes
unimportant details of tests and test utils, making it easier for
the reader to skim past them by introducing additional variables.

Author: TheBlueMatt

lightning/src/ln/async_signer_tests.rs

@@ -1299,20 +1299,10 @@ fn do_test_closing_signed(extra_closing_signed: bool, reconnect: bool) {
 
 	assert!(nodes[0].node.list_channels().is_empty());
 	assert!(nodes[1].node.list_channels().is_empty());
-	check_closed_event!(
-		nodes[0],
-		1,
-		ClosureReason::LocallyInitiatedCooperativeClosure,
-		[node_b_id],
-		100000
-	);
-	check_closed_event!(
-		nodes[1],
-		1,
-		ClosureReason::CounterpartyInitiatedCooperativeClosure,
-		[node_a_id],
-		100000
-	);
+	let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;
+	check_closed_event!(nodes[0], 1, reason_a, [node_b_id], 100000);
+	let reason_b = ClosureReason::CounterpartyInitiatedCooperativeClosure;
+	check_closed_event!(nodes[1], 1, reason_b, [node_a_id], 100000);
 }
 
 #[test]

lightning/src/ln/functional_test_utils.rs

@@ -799,12 +799,8 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 			{
 				for channel_id in self.chain_monitor.chain_monitor.list_monitors() {
 					let mut w = test_utils::TestVecWriter(Vec::new());
-					self.chain_monitor
-						.chain_monitor
-						.get_monitor(channel_id)
-						.unwrap()
-						.write(&mut w)
-						.unwrap();
+					let mon = self.chain_monitor.chain_monitor.get_monitor(channel_id).unwrap();
+					mon.write(&mut w).unwrap();
 					let (_, deserialized_monitor) =
 						<(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 							&mut io::Cursor::new(&w.0),

lightning/src/ln/priv_short_conf_tests.rs

@@ -105,13 +105,9 @@ fn test_priv_forwarding_rejection() {
 
 	nodes[0].node.handle_update_fail_htlc(node_b_id, &htlc_fail_updates.update_fail_htlcs[0]);
 	commitment_signed_dance!(nodes[0], nodes[1], htlc_fail_updates.commitment_signed, true, true);
-	expect_payment_failed_with_update!(
-		nodes[0],
-		our_payment_hash,
-		false,
-		nodes[2].node.list_channels()[0].short_channel_id.unwrap(),
-		true
-	);
+
+	let chan_2_scid = nodes[2].node.list_channels()[0].short_channel_id.unwrap();
+	expect_payment_failed_with_update!(nodes[0], our_payment_hash, false, chan_2_scid, true);
 
 	// Now disconnect nodes[1] from its peers and restart with accept_forwards_to_priv_channels set
 	// to true. Sadly there is currently no way to change it at runtime.
@@ -967,14 +963,11 @@ fn test_0conf_channel_with_async_monitor() {
 	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 
 	chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
-	let (_, latest_update) = nodes[1]
-		.chain_monitor
-		.latest_monitor_update_id
-		.lock()
-		.unwrap()
-		.get(&bs_raa.channel_id)
-		.unwrap()
-		.clone();
+	let (_, latest_update) = {
+		let latest_monitor_update_id =
+			nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
+		latest_monitor_update_id.get(&bs_raa.channel_id).unwrap().clone()
+	};
 	nodes[1]
 		.chain_monitor
 		.chain_monitor
@@ -1020,13 +1013,8 @@ fn test_0conf_close_no_early_chan_update() {
 
 	nodes[0].node.force_close_all_channels_broadcasting_latest_txn(error_message.to_string());
 	check_added_monitors!(nodes[0], 1);
-	check_closed_event!(
-		&nodes[0],
-		1,
-		ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) },
-		[node_b_id],
-		100000
-	);
+	let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) };
+	check_closed_event!(&nodes[0], 1, reason, [node_b_id], 100000);
 	let _ = get_err_msg(&nodes[0], &node_b_id);
 }
 
@@ -1138,28 +1126,18 @@ fn test_0conf_channel_reorg() {
 	// At this point the channel no longer has an SCID again. In the future we should likely
 	// support simply un-setting the SCID and waiting until the channel gets re-confirmed, but for
 	// now we force-close the channel here.
-	check_closed_event!(
-		&nodes[0],
-		1,
-		ClosureReason::ProcessingError {
-			err: "Funding transaction was un-confirmed. Locked at 0 confs, now have 0 confs."
-				.to_owned()
-		},
-		[node_b_id],
-		100000
-	);
+	let reason = ClosureReason::ProcessingError {
+		err: "Funding transaction was un-confirmed. Locked at 0 confs, now have 0 confs."
+			.to_owned()
+	};
+	check_closed_event!(&nodes[0], 1, reason, [node_b_id], 100000);
 	check_closed_broadcast!(nodes[0], true);
 	check_added_monitors(&nodes[0], 1);
-	check_closed_event!(
-		&nodes[1],
-		1,
-		ClosureReason::ProcessingError {
-			err: "Funding transaction was un-confirmed. Locked at 0 confs, now have 0 confs."
-				.to_owned()
-		},
-		[node_a_id],
-		100000
-	);
+	let reason = ClosureReason::ProcessingError {
+		err: "Funding transaction was un-confirmed. Locked at 0 confs, now have 0 confs."
+			.to_owned()
+	};
+	check_closed_event!(&nodes[1], 1, reason, [node_a_id], 100000);
 	check_closed_broadcast!(nodes[1], true);
 	check_added_monitors(&nodes[1], 1);
 }

lightning/src/ln/shutdown_tests.rs

@@ -1346,20 +1346,12 @@ fn do_test_closing_signed_reinit_timeout(timeout_step: TimeoutStep) {
 		// nodes[1] should happily accept and respond to.
 		node_0_closing_signed.fee_range.as_mut().unwrap().max_fee_satoshis *= 10;
 		{
-			let mut node_0_per_peer_lock;
-			let mut node_0_peer_state_lock;
-			get_channel_ref!(
-				nodes[0],
-				nodes[1],
-				node_0_per_peer_lock,
-				node_0_peer_state_lock,
-				chan_id
-			)
-			.context_mut()
-			.closing_fee_limits
-			.as_mut()
-			.unwrap()
-			.1 *= 10;
+			let mut per_peer_lock;
+			let mut peer_state_lock;
+			let chan =
+				get_channel_ref!(nodes[0], nodes[1], per_peer_lock, peer_state_lock, chan_id);
+
+			chan.context_mut().closing_fee_limits.as_mut().unwrap().1 *= 10;
 		}
 		nodes[1].node.handle_closing_signed(node_a_id, &node_0_closing_signed);
 		let node_1_closing_signed =
@@ -1609,14 +1601,11 @@ fn do_outbound_update_no_early_closing_signed(use_htlc: bool) {
 
 	expect_channel_shutdown_state!(nodes[0], chan_id, ChannelShutdownState::ResolvingHTLCs);
 	assert_eq!(nodes[0].node.get_and_clear_pending_msg_events(), Vec::new());
-	let (latest_update, _) = nodes[0]
-		.chain_monitor
-		.latest_monitor_update_id
-		.lock()
-		.unwrap()
-		.get(&chan_id)
-		.unwrap()
-		.clone();
+	let (latest_update, _) = {
+		let latest_monitor_update_id =
+			nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap();
+		latest_monitor_update_id.get(&chan_id).unwrap().clone()
+	};
 	nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(chan_id, latest_update);
 
 	let as_raa_closing_signed = nodes[0].node.get_and_clear_pending_msg_events();