ln/format: rust format channel_acceptance_tests

Author: carlaKC

lightning/src/ln/channel_acceptance_tests.rs

@@ -1,8 +1,10 @@
-use lightning_types::features::ChannelTypeFeatures;
 use crate::events::Event;
-use crate::util::config::{ChannelConfigOverrides, UserConfig, ChannelHandshakeConfigUpdate};
 use crate::ln::functional_test_utils::*;
-use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, AcceptChannel, ErrorAction, MessageSendEvent};
+use crate::ln::msgs::{
+	AcceptChannel, BaseMessageHandler, ChannelMessageHandler, ErrorAction, MessageSendEvent,
+};
+use crate::util::config::{ChannelConfigOverrides, ChannelHandshakeConfigUpdate, UserConfig};
+use lightning_types::features::ChannelTypeFeatures;
 
 #[test]
 fn test_inbound_anchors_manual_acceptance() {
@@ -28,8 +30,7 @@ fn test_inbound_anchors_manual_acceptance_overridden() {
 	let mut anchors_cfg = test_default_channel_config();
 	anchors_cfg.channel_handshake_config.negotiate_anchors_zero_fee_htlc_tx = true;
 
-	let accept_message =
-		do_test_manual_inbound_accept_with_override(anchors_cfg, Some(overrides));
+	let accept_message = do_test_manual_inbound_accept_with_override(anchors_cfg, Some(overrides));
 	assert_eq!(accept_message.common_fields.max_htlc_value_in_flight_msat, 5_000_000);
 	assert_eq!(accept_message.common_fields.htlc_minimum_msat, 1_000);
 	assert_eq!(accept_message.common_fields.minimum_depth, 2);
@@ -45,21 +46,30 @@ fn test_inbound_zero_fee_commitments_manual_acceptance() {
 	do_test_manual_inbound_accept_with_override(zero_fee_cfg, None);
 }
 
-#[rustfmt::skip]
-fn do_test_manual_inbound_accept_with_override(start_cfg: UserConfig,
-	config_overrides: Option<ChannelConfigOverrides>) -> AcceptChannel {
-
+fn do_test_manual_inbound_accept_with_override(
+	start_cfg: UserConfig, config_overrides: Option<ChannelConfigOverrides>,
+) -> AcceptChannel {
 	let mut mannual_accept_cfg = start_cfg.clone();
 	mannual_accept_cfg.manually_accept_inbound_channels = true;
 
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs,
-		&[Some(start_cfg.clone()), Some(start_cfg.clone()), Some(mannual_accept_cfg.clone())]);
+	let node_chanmgrs = create_node_chanmgrs(
+		3,
+		&node_cfgs,
+		&[Some(start_cfg.clone()), Some(start_cfg.clone()), Some(mannual_accept_cfg.clone())],
+	);
 	let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
-	nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100_000, 0, 42, None, None).unwrap();
-	let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
+	nodes[0]
+		.node
+		.create_channel(nodes[1].node.get_our_node_id(), 100_000, 0, 42, None, None)
+		.unwrap();
+	let open_channel_msg = get_event_msg!(
+		nodes[0],
+		MessageSendEvent::SendOpenChannel,
+		nodes[1].node.get_our_node_id()
+	);
 
 	nodes[1].node.handle_open_channel(nodes[0].node.get_our_node_id(), &open_channel_msg);
 	assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
@@ -68,19 +78,27 @@ fn do_test_manual_inbound_accept_with_override(start_cfg: UserConfig,
 		MessageSendEvent::HandleError { node_id, action } => {
 			assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 			match action {
-				ErrorAction::SendErrorMessage { msg } =>
-					assert_eq!(msg.data, "No channels with anchor outputs accepted".to_owned()),
+				ErrorAction::SendErrorMessage { msg } => {
+					assert_eq!(msg.data, "No channels with anchor outputs accepted".to_owned())
+				},
 				_ => panic!("Unexpected error action"),
 			}
-		}
+		},
 		_ => panic!("Unexpected event"),
 	}
 
 	nodes[2].node.handle_open_channel(nodes[0].node.get_our_node_id(), &open_channel_msg);
 	let events = nodes[2].node.get_and_clear_pending_events();
 	match events[0] {
-		Event::OpenChannelRequest { temporary_channel_id, .. } =>
-			nodes[2].node.accept_inbound_channel(&temporary_channel_id, &nodes[0].node.get_our_node_id(), 23, config_overrides).unwrap(),
+		Event::OpenChannelRequest { temporary_channel_id, .. } => nodes[2]
+			.node
+			.accept_inbound_channel(
+				&temporary_channel_id,
+				&nodes[0].node.get_our_node_id(),
+				23,
+				config_overrides,
+			)
+			.unwrap(),
 		_ => panic!("Unexpected event"),
 	}
 	get_event_msg!(nodes[2], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id())
@@ -170,33 +188,53 @@ fn test_zero_fee_commitments_downgrade_to_static_remote() {
 	do_test_channel_type_downgrade(initiator_cfg, receiver_cfg, start_type, vec![end_type]);
 }
 
-#[rustfmt::skip]
-fn do_test_channel_type_downgrade(initiator_cfg: UserConfig, acceptor_cfg: UserConfig,
-	start_type: ChannelTypeFeatures, downgrade_types: Vec<ChannelTypeFeatures>) {
+fn do_test_channel_type_downgrade(
+	initiator_cfg: UserConfig, acceptor_cfg: UserConfig, start_type: ChannelTypeFeatures,
+	downgrade_types: Vec<ChannelTypeFeatures>,
+) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(initiator_cfg), Some(acceptor_cfg)]);
+	let node_chanmgrs =
+		create_node_chanmgrs(2, &node_cfgs, &[Some(initiator_cfg), Some(acceptor_cfg)]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 	let error_message = "Channel force-closed";
 
-	nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100_000, 0, 0, None, None).unwrap();
-	let mut open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
+	nodes[0]
+		.node
+		.create_channel(nodes[1].node.get_our_node_id(), 100_000, 0, 0, None, None)
+		.unwrap();
+	let mut open_channel_msg = get_event_msg!(
+		nodes[0],
+		MessageSendEvent::SendOpenChannel,
+		nodes[1].node.get_our_node_id()
+	);
 	assert_eq!(open_channel_msg.common_fields.channel_type.as_ref().unwrap(), &start_type);
 
 	for downgrade_type in downgrade_types {
 		nodes[1].node.handle_open_channel(nodes[0].node.get_our_node_id(), &open_channel_msg);
 		let events = nodes[1].node.get_and_clear_pending_events();
 		match events[0] {
 			Event::OpenChannelRequest { temporary_channel_id, .. } => {
-				nodes[1].node.force_close_broadcasting_latest_txn(&temporary_channel_id, &nodes[0].node.get_our_node_id(), error_message.to_string()).unwrap();
-			}
+				nodes[1]
+					.node
+					.force_close_broadcasting_latest_txn(
+						&temporary_channel_id,
+						&nodes[0].node.get_our_node_id(),
+						error_message.to_string(),
+					)
+					.unwrap();
+			},
 			_ => panic!("Unexpected event"),
 		}
 
 		let error_msg = get_err_msg(&nodes[1], &nodes[0].node.get_our_node_id());
 		nodes[0].node.handle_error(nodes[1].node.get_our_node_id(), &error_msg);
 
-		open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
+		open_channel_msg = get_event_msg!(
+			nodes[0],
+			MessageSendEvent::SendOpenChannel,
+			nodes[1].node.get_our_node_id()
+		);
 		let channel_type = open_channel_msg.common_fields.channel_type.as_ref().unwrap();
 		assert_eq!(channel_type, &downgrade_type);
 
@@ -207,7 +245,6 @@ fn do_test_channel_type_downgrade(initiator_cfg: UserConfig, acceptor_cfg: UserC
 }
 
 #[test]
-#[rustfmt::skip]
 fn test_no_channel_downgrade() {
 	// Tests that the local node will not retry when a `option_static_remote` channel is
 	// rejected by a peer that advertises support for the feature.
@@ -218,21 +255,36 @@ fn test_no_channel_downgrade() {
 
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(initiator_cfg), Some(receiver_cfg)]);
+	let node_chanmgrs =
+		create_node_chanmgrs(2, &node_cfgs, &[Some(initiator_cfg), Some(receiver_cfg)]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 	let error_message = "Channel force-closed";
 
-	nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100_000, 0, 0, None, None).unwrap();
-	let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
+	nodes[0]
+		.node
+		.create_channel(nodes[1].node.get_our_node_id(), 100_000, 0, 0, None, None)
+		.unwrap();
+	let open_channel_msg = get_event_msg!(
+		nodes[0],
+		MessageSendEvent::SendOpenChannel,
+		nodes[1].node.get_our_node_id()
+	);
 	let start_type = ChannelTypeFeatures::only_static_remote_key();
 	assert_eq!(open_channel_msg.common_fields.channel_type.as_ref().unwrap(), &start_type);
 
 	nodes[1].node.handle_open_channel(nodes[0].node.get_our_node_id(), &open_channel_msg);
 	let events = nodes[1].node.get_and_clear_pending_events();
 	match events[0] {
 		Event::OpenChannelRequest { temporary_channel_id, .. } => {
-			nodes[1].node.force_close_broadcasting_latest_txn(&temporary_channel_id, &nodes[0].node.get_our_node_id(), error_message.to_string()).unwrap();
-		}
+			nodes[1]
+				.node
+				.force_close_broadcasting_latest_txn(
+					&temporary_channel_id,
+					&nodes[0].node.get_our_node_id(),
+					error_message.to_string(),
+				)
+				.unwrap();
+		},
 		_ => panic!("Unexpected event"),
 	}
 
@@ -242,5 +294,8 @@ fn test_no_channel_downgrade() {
 	// Since nodes[0] could not retry the channel with a different type, it should close it.
 	let chan_closed_events = nodes[0].node.get_and_clear_pending_events();
 	assert_eq!(chan_closed_events.len(), 1);
-	if let Event::ChannelClosed { .. } = chan_closed_events[0] { } else { panic!(); }
+	if let Event::ChannelClosed { .. } = chan_closed_events[0] {
+	} else {
+		panic!();
+	}
 }

lightning/src/ln/mod.rs

@@ -71,10 +71,10 @@ mod blinded_payment_tests;
 pub mod bolt11_payment_tests;
 #[cfg(test)]
 #[allow(unused_mut)]
-mod channel_acceptance_tests;
+mod chanmon_update_fail_tests;
 #[cfg(test)]
 #[allow(unused_mut)]
-mod chanmon_update_fail_tests;
+mod channel_acceptance_tests;
 #[cfg(test)]
 #[allow(unused_mut)]
 mod dual_funding_tests;