f drop excess return value from coop-close case

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3260,7 +3260,7 @@ macro_rules! convert_channel_err {
 			convert_channel_err!($self, $peer_state, reason, $funded_channel, do_close, locked_close, $channel_id, _internal);
 		err.dont_send_error_message();
 		debug_assert!(close);
-		(close, err)
+		err
 	} };
 	($self: ident, $peer_state: expr, $err: expr, $funded_channel: expr, $channel_id: expr, FUNDED_CHANNEL) => { {
 		let mut do_close = |reason| {
@@ -9767,7 +9767,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 							// also implies there are no pending HTLCs left on the channel, so we can
 							// fully delete it from tracking (the channel monitor is still around to
 							// watch for old state broadcasts)!
-							let (_, err) = convert_channel_err!(self, peer_state, close_res, chan, &msg.channel_id, COOP_CLOSED);
+							let err = convert_channel_err!(self, peer_state, close_res, chan, &msg.channel_id, COOP_CLOSED);
 							chan_entry.remove();
 							Some((tx, Err(err)))
 						} else {
@@ -11053,16 +11053,17 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					Some((_, channel_id)) if chan.context().channel_id() != channel_id => None,
 					_ => unblock_chan(chan, &mut peer_state.pending_msg_events),
 				};
-				if let Some(shutdown_res) = shutdown_result {
+				if let Some(shutdown) = shutdown_result {
 					let context = chan.context();
 					let logger = WithChannelContext::from(&self.logger, context, None);
 					let chan_id = context.channel_id();
 					log_trace!(logger, "Removing channel {} now that the signer is unblocked", chan_id);
-					let (remove, err) = if let Some(funded_channel) = chan.as_funded_mut() {
-						convert_channel_err!(self, peer_state, shutdown_res, funded_channel, &chan_id, COOP_CLOSED)
+					let (remove, err) = if let Some(funded) = chan.as_funded_mut() {
+						let err = convert_channel_err!(self, peer_state, shutdown, funded, &chan_id, COOP_CLOSED);
+						(true, err)
 					} else {
 						debug_assert!(false);
-						let reason = shutdown_res.closure_reason.clone();
+						let reason = shutdown.closure_reason.clone();
 						let err = ChannelError::Close((reason.to_string(), reason));
 						convert_channel_err!(self, peer_state, err, chan, &chan_id, UNFUNDED_CHANNEL)
 					};
@@ -11110,7 +11111,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 									if let Some((tx, shutdown_res)) = tx_shutdown_result_opt {
 										// We're done with this channel. We got a closing_signed and sent back
 										// a closing_signed with a closing transaction to broadcast.
-										let (_, err) = convert_channel_err!(self, peer_state, shutdown_res, funded_chan, channel_id, COOP_CLOSED);
+										let err = convert_channel_err!(self, peer_state, shutdown_res, funded_chan, channel_id, COOP_CLOSED);
 										handle_errors.push((*cp_id, Err(err)));
 
 										log_info!(logger, "Broadcasting {}", log_tx!(tx));