fix Use try_channel_entry macro in some error branches

Author: optout21

lightning/src/ln/channelmanager.rs

@@ -9571,7 +9571,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 							});
 						},
 						Err(err) => {
-							return Err(MsgHandleErrInternal::from_chan_no_close(err, msg.channel_id));
+							try_channel_entry!(self, peer_state, Err(err), chan_entry)
 						}
 					}
 				} else {
@@ -9606,12 +9606,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					"Got a message for a channel from the wrong node! No such channel for the passed counterparty_node_id {}",
 					counterparty_node_id
 				), msg.channel_id)),
-			hash_map::Entry::Occupied(mut chan) => {
-				if let Some(chan) = chan.get_mut().as_funded_mut() {
+			hash_map::Entry::Occupied(mut chan_entry) => {
+				if let Some(chan) = chan_entry.get_mut().as_funded_mut() {
 					match chan.splice_ack(msg) {
 						Ok(_) => {}
 						Err(err) => {
-							return Err(MsgHandleErrInternal::from_chan_no_close(err, msg.channel_id));
+							try_channel_entry!(self, peer_state, Err(err), chan_entry)
 						}
 					}
 				} else {

lightning/src/ln/functional_tests_splice.rs

@@ -32,7 +32,12 @@ fn test_v1_splice_in() {
 	let channel_reserve_amnt_sat = 1_000;
 
 	let (_, _, channel_id, _) = create_announced_chan_between_nodes_with_value(
-		&nodes, initiator_node_index, acceptor_node_index, channel_value_sat, push_msat);
+		&nodes,
+		initiator_node_index,
+		acceptor_node_index,
+		channel_value_sat,
+		push_msat,
+	);
 
 	let expected_funded_channel_id =
 		"ae3367da2c13bc1ceb86bf56418f62828f7ce9d6bfb15a46af5ba1f1ed8b124f";