Merge pull request #3088 from alecchendev/2024-06-fc-no-disconnect

Don't disconnect on manual force closes

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3382,8 +3382,8 @@ where
 					peer_state.pending_msg_events.push(
 						events::MessageSendEvent::HandleError {
 							node_id: counterparty_node_id,
-							action: msgs::ErrorAction::DisconnectPeer {
-								msg: Some(msgs::ErrorMessage { channel_id: *channel_id, data: error_message})
+							action: msgs::ErrorAction::SendErrorMessage {
+								msg: msgs::ErrorMessage { channel_id: *channel_id, data: error_message }
 							},
 						}
 					);

lightning/src/ln/functional_tests.rs

@@ -11136,7 +11136,7 @@ fn do_test_funding_and_commitment_tx_confirm_same_block(confirm_remote_commitmen
 	let mut msg_events = closing_node.node.get_and_clear_pending_msg_events();
 	assert_eq!(msg_events.len(), 1);
 	match msg_events.pop().unwrap() {
-		MessageSendEvent::HandleError { action: msgs::ErrorAction::DisconnectPeer { .. }, .. } => {},
+		MessageSendEvent::HandleError { action: msgs::ErrorAction::SendErrorMessage { .. }, .. } => {},
 		_ => panic!("Unexpected event"),
 	}
 	check_added_monitors(closing_node, 1);

lightning/src/ln/reload_tests.rs

@@ -643,8 +643,8 @@ fn do_test_data_loss_protect(reconnect_panicing: bool, substantially_old: bool,
 			if let MessageSendEvent::BroadcastChannelUpdate { .. } = msg {
 			} else if let MessageSendEvent::HandleError { ref action, .. } = msg {
 				match action {
-					&ErrorAction::DisconnectPeer { ref msg } => {
-						assert_eq!(msg.as_ref().unwrap().data, "Channel force-closed");
+					&ErrorAction::SendErrorMessage { ref msg } => {
+						assert_eq!(&msg.data, "Channel force-closed");
 					},
 					_ => panic!("Unexpected event!"),
 				}