f combine error convert macros

Author: dunxen

lightning/src/ln/channelmanager.rs

@@ -1828,55 +1828,43 @@ macro_rules! convert_unfunded_chan_err {
 }
 
 /// Returns (boolean indicating if we should remove the Channel object from memory, a mapped error)
-macro_rules! convert_funded_chan_err {
-	($self: ident, $err: expr, $channel: expr, $channel_id: expr) => {
+macro_rules! convert_chan_phase_err {
+	($self: ident, $err: expr, $channel: expr, $channel_id: expr, MANUAL_CHANNEL_UPDATE, $channel_update: expr) => {
 		match $err {
 			ChannelError::Warn(msg) => {
-				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Warn(msg), $channel_id.clone()))
+				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Warn(msg), *$channel_id))
 			},
 			ChannelError::Ignore(msg) => {
-				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Ignore(msg), $channel_id.clone()))
+				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Ignore(msg), *$channel_id))
 			},
 			ChannelError::Close(msg) => {
 				log_error!($self.logger, "Closing channel {} due to close-required error: {}", $channel_id, msg);
 				update_maps_on_chan_removal!($self, $channel.context);
 				let shutdown_res = $channel.context.force_shutdown(true);
+				let user_id = $channel.context.get_user_id();
+				let channel_capacity_satoshis = $channel.context.get_value_satoshis();
 
-				(true, MsgHandleErrInternal::from_finish_shutdown(msg, *$channel_id, $channel.context.get_user_id(),
-					shutdown_res, $self.get_channel_update_for_broadcast(&$channel).ok(), $channel.context.get_value_satoshis()))
+				(true, MsgHandleErrInternal::from_finish_shutdown(msg, *$channel_id, user_id,
+					shutdown_res, $channel_update, channel_capacity_satoshis))
 			},
 		}
 	};
-}
-
-/// Returns (boolean indicating if we should remove the Channel object from memory, a mapped error)
-macro_rules! convert_chan_phase_err {
+	($self: ident, $err: expr, $channel: expr, $channel_id: expr, FUNDED_CHANNEL) => {
+		convert_chan_phase_err!($self, $err, $channel, $channel_id, MANUAL_CHANNEL_UPDATE, { $self.get_channel_update_for_broadcast($channel).ok() })
+	};
+	($self: ident, $err: expr, $channel: expr, $channel_id: expr, UNFUNDED_CHANNEL) => {
+		convert_chan_phase_err!($self, $err, $channel, $channel_id, MANUAL_CHANNEL_UPDATE, None)
+	};
 	($self: ident, $err: expr, $channel_phase: expr, $channel_id: expr) => {
-		match $err {
-			ChannelError::Warn(msg) => {
-				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Warn(msg), *$channel_id))
+		match $channel_phase {
+			ChannelPhase::Funded(channel) => {
+				convert_chan_phase_err!($self, $err, channel, $channel_id, FUNDED_CHANNEL)
 			},
-			ChannelError::Ignore(msg) => {
-				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Ignore(msg), *$channel_id))
+			ChannelPhase::UnfundedOutboundV1(channel) => {
+				convert_chan_phase_err!($self, $err, channel, $channel_id, UNFUNDED_CHANNEL)
 			},
-			ChannelError::Close(msg) => {
-				log_error!($self.logger, "Closing channel {} due to close-required error: {}", $channel_id, msg);
-				let context = $channel_phase.context_mut();
-				update_maps_on_chan_removal!($self, context);
-				let shutdown_res = context.force_shutdown(true);
-				let user_id = context.get_user_id();
-				let channel_capacity_satoshis = context.get_value_satoshis();
-
-				match $channel_phase {
-					ChannelPhase::Funded(chan) => {
-						(true, MsgHandleErrInternal::from_finish_shutdown(msg, *$channel_id, user_id,
-							shutdown_res, $self.get_channel_update_for_broadcast(&chan).ok(), channel_capacity_satoshis))
-					},
-					_ => {
-						(true, MsgHandleErrInternal::from_finish_shutdown(msg, *$channel_id, user_id,
-							shutdown_res, None, channel_capacity_satoshis))
-					}
-				}
+			ChannelPhase::UnfundedInboundV1(channel) => {
+				convert_chan_phase_err!($self, $err, channel, $channel_id, UNFUNDED_CHANNEL)
 			},
 		}
 	};
@@ -4608,7 +4596,7 @@ where
 								if chan_needs_persist == NotifyOption::DoPersist { should_persist = NotifyOption::DoPersist; }
 
 								if let Err(e) = chan.timer_check_closing_negotiation_progress() {
-									let (needs_close, err) = convert_funded_chan_err!(self, e, chan, chan_id);
+									let (needs_close, err) = convert_chan_phase_err!(self, e, chan, chan_id, FUNDED_CHANNEL);
 									handle_errors.push((Err(err), counterparty_node_id));
 									if needs_close { return false; }
 								}
@@ -6707,7 +6695,7 @@ where
 								},
 								Err(e) => {
 									has_update = true;
-									let (close_channel, res) = convert_funded_chan_err!(self, e, chan, channel_id);
+									let (close_channel, res) = convert_chan_phase_err!(self, e, chan, channel_id, FUNDED_CHANNEL);
 									handle_errors.push((chan.context.get_counterparty_node_id(), Err(res)));
 									!close_channel
 								}