f rustfmt

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3656,39 +3656,40 @@ macro_rules! locked_close_channel {
 	}}
 }
 
-fn convert_channel_err_internal<Close: FnOnce(ClosureReason, &str) -> (ShutdownResult, Option<(msgs::ChannelUpdate, NodeId, NodeId)>)>(
+fn convert_channel_err_internal<
+	Close: FnOnce(ClosureReason, &str) -> (ShutdownResult, Option<(msgs::ChannelUpdate, NodeId, NodeId)>),
+>(
 	err: ChannelError, chan_id: ChannelId, close: Close,
 ) -> (bool, MsgHandleErrInternal) {
 	match err {
 		ChannelError::Warn(msg) => {
 			(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Warn(msg), chan_id))
 		},
-		ChannelError::WarnAndDisconnect(msg) => {
-			(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::WarnAndDisconnect(msg), chan_id))
-		},
+		ChannelError::WarnAndDisconnect(msg) => (
+			false,
+			MsgHandleErrInternal::from_chan_no_close(ChannelError::WarnAndDisconnect(msg), chan_id),
+		),
 		ChannelError::Ignore(msg) => {
 			(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Ignore(msg), chan_id))
 		},
 		ChannelError::Abort(reason) => {
 			(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Abort(reason), chan_id))
 		},
 		ChannelError::Close((msg, reason)) => {
-			let (shutdown_res, chan_update) = close(reason, &msg);
-			(true, MsgHandleErrInternal::from_finish_shutdown(msg, chan_id, shutdown_res, chan_update))
+			let (finish, chan_update) = close(reason, &msg);
+			(true, MsgHandleErrInternal::from_finish_shutdown(msg, chan_id, finish, chan_update))
 		},
 		ChannelError::SendError(msg) => {
 			(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::SendError(msg), chan_id))
 		},
 	}
 }
 
-fn convert_funded_channel_err_internal<
-	SP: Deref,
-	CM: AChannelManager<SP = SP>,
->(
-	cm: & CM, closed_channel_monitor_update_ids: &mut BTreeMap<ChannelId, u64>,
-	in_flight_monitor_updates: &mut BTreeMap<ChannelId, (OutPoint, Vec<ChannelMonitorUpdate>)>,
-	coop_close_shutdown_res: Option<ShutdownResult>, err: ChannelError, chan: &mut FundedChannel<SP>,
+fn convert_funded_channel_err_internal<SP: Deref, CM: AChannelManager<SP = SP>>(
+	cm: &CM, closed_update_ids: &mut BTreeMap<ChannelId, u64>,
+	in_flight_updates: &mut BTreeMap<ChannelId, (OutPoint, Vec<ChannelMonitorUpdate>)>,
+	coop_close_shutdown_res: Option<ShutdownResult>, err: ChannelError,
+	chan: &mut FundedChannel<SP>,
 ) -> (bool, MsgHandleErrInternal)
 where
 	SP::Target: SignerProvider,
@@ -3699,15 +3700,12 @@ where
 		let cm = cm.get_cm();
 		let logger = WithChannelContext::from(&cm.logger, &chan.context, None);
 
-		let mut shutdown_res = if let Some(res) = coop_close_shutdown_res {
-			res
-		} else {
-			chan.force_shutdown(reason)
-		};
+		let mut shutdown_res =
+			if let Some(res) = coop_close_shutdown_res { res } else { chan.force_shutdown(reason) };
 		let chan_update = cm.get_channel_update_for_broadcast(chan).ok();
 
 		log_error!(logger, "Closed channel {} due to close-required error: {}", chan_id, msg);
-		locked_close_channel!(cm, closed_channel_monitor_update_ids, in_flight_monitor_updates, chan, shutdown_res, FUNDED);
+		locked_close_channel!(cm, closed_update_ids, in_flight_updates, chan, shutdown_res, FUNDED);
 		(shutdown_res, chan_update)
 	})
 }