From 4f5ac107c4a06e7f9a4089a37a955567c9bdfc27 Mon Sep 17 00:00:00 2001
From: Antoine Riard <dev@ariard.me>
Date: Tue, 13 Jul 2021 12:55:32 -0400
Subject: [PATCH] Extend MsgHandleErrInternal with a new chan_id field
 Option<[u8; 32]>

This field is used in next commit to generate appropriate
ChannelClosed event at `handle_error()` processing.
---
 lightning/src/ln/channelmanager.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 46cbaac3..dccca13f 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -242,6 +242,7 @@ type ShutdownResult = (Option<(OutPoint, ChannelMonitorUpdate)>, Vec<(HTLCSource
 
 struct MsgHandleErrInternal {
 	err: msgs::LightningError,
+	chan_id: Option<[u8; 32]>,
 	shutdown_finish: Option<(ShutdownResult, Option<msgs::ChannelUpdate>)>,
 }
 impl MsgHandleErrInternal {
@@ -257,6 +258,7 @@ impl MsgHandleErrInternal {
 					},
 				},
 			},
+			chan_id: Some(channel_id),
 			shutdown_finish: None,
 		}
 	}
@@ -267,12 +269,13 @@ impl MsgHandleErrInternal {
 				err,
 				action: msgs::ErrorAction::IgnoreError,
 			},
+			chan_id: None,
 			shutdown_finish: None,
 		}
 	}
 	#[inline]
 	fn from_no_close(err: msgs::LightningError) -> Self {
-		Self { err, shutdown_finish: None }
+		Self { err, chan_id: None, shutdown_finish: None }
 	}
 	#[inline]
 	fn from_finish_shutdown(err: String, channel_id: [u8; 32], shutdown_res: ShutdownResult, channel_update: Option<msgs::ChannelUpdate>) -> Self {
@@ -286,6 +289,7 @@ impl MsgHandleErrInternal {
 					},
 				},
 			},
+			chan_id: Some(channel_id),
 			shutdown_finish: Some((shutdown_res, channel_update)),
 		}
 	}
@@ -320,6 +324,7 @@ impl MsgHandleErrInternal {
 					},
 				},
 			},
+			chan_id: Some(channel_id),
 			shutdown_finish: None,
 		}
 	}
@@ -813,7 +818,7 @@ macro_rules! handle_error {
 	($self: ident, $internal: expr, $counterparty_node_id: expr) => {
 		match $internal {
 			Ok(msg) => Ok(msg),
-			Err(MsgHandleErrInternal { err, shutdown_finish }) => {
+			Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 				#[cfg(debug_assertions)]
 				{
 					// In testing, ensure there are no deadlocks where the lock is already held upon
-- 
2.30.2