Add ChannelError::WarnAndDisconnect variant

The existing `ChannelError::Warn` variant only sends the warning and
does not disconnect. There are certain cases where we want to just send
a warning, and other cases where we want to also disconnect, so we
keep both variants around.

Author: wpaulino

lightning/src/ln/channel.rs

@@ -712,17 +712,19 @@ pub const MIN_THEIR_CHAN_RESERVE_SATOSHIS: u64 = 1000;
 pub(super) enum ChannelError {
 	Ignore(String),
 	Warn(String),
+	WarnAndDisconnect(String),
 	Close((String, ClosureReason)),
 	SendError(String),
 }
 
 impl fmt::Debug for ChannelError {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
-			&ChannelError::Ignore(ref e) => write!(f, "Ignore : {}", e),
-			&ChannelError::Warn(ref e) => write!(f, "Warn : {}", e),
-			&ChannelError::Close((ref e, _)) => write!(f, "Close : {}", e),
-			&ChannelError::SendError(ref e) => write!(f, "Not Found : {}", e),
+			&ChannelError::Ignore(ref e) => write!(f, "Ignore: {}", e),
+			&ChannelError::Warn(ref e) => write!(f, "Warn: {}", e),
+			&ChannelError::WarnAndDisconnect(ref e) => write!(f, "Disconnecting with warning: {}", e),
+			&ChannelError::Close((ref e, _)) => write!(f, "Close: {}", e),
+			&ChannelError::SendError(ref e) => write!(f, "Not Found: {}", e),
 		}
 	}
 }
@@ -732,6 +734,7 @@ impl fmt::Display for ChannelError {
 		match self {
 			&ChannelError::Ignore(ref e) => write!(f, "{}", e),
 			&ChannelError::Warn(ref e) => write!(f, "{}", e),
+			&ChannelError::WarnAndDisconnect(ref e) => write!(f, "{}", e),
 			&ChannelError::Close((ref e, _)) => write!(f, "{}", e),
 			&ChannelError::SendError(ref e) => write!(f, "{}", e),
 		}

lightning/src/ln/channelmanager.rs

@@ -816,6 +816,15 @@ impl MsgHandleErrInternal {
 						log_level: Level::Warn,
 					},
 				},
+				ChannelError::WarnAndDisconnect(msg) =>  LightningError {
+					err: msg.clone(),
+					action: msgs::ErrorAction::DisconnectPeerWithWarning {
+						msg: msgs::WarningMessage {
+							channel_id,
+							data: msg
+						},
+					},
+				},
 				ChannelError::Ignore(msg) => LightningError {
 					err: msg,
 					action: msgs::ErrorAction::IgnoreError,
@@ -3036,6 +3045,9 @@ macro_rules! convert_channel_err {
 			ChannelError::Warn(msg) => {
 				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Warn(msg), *$channel_id))
 			},
+			ChannelError::WarnAndDisconnect(msg) => {
+				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::WarnAndDisconnect(msg), *$channel_id))
+			},
 			ChannelError::Ignore(msg) => {
 				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::Ignore(msg), *$channel_id))
 			},