Add ChannelError::SendError variant

When moving ChannelPhase logic from ChannelManager into Channel, it is
useful to error when a Channel is not in the expected state. Add a
ChannelError::SendError variant for this purpose, which results in
sending an error message without closing the channel.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -713,6 +713,7 @@ pub(super) enum ChannelError {
 	Ignore(String),
 	Warn(String),
 	Close((String, ClosureReason)),
+	SendError(String),
 }
 
 impl fmt::Debug for ChannelError {
@@ -721,6 +722,7 @@ impl fmt::Debug for ChannelError {
 			&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),
 		}
 	}
 }
@@ -731,6 +733,7 @@ impl fmt::Display for ChannelError {
 			&ChannelError::Ignore(ref e) => write!(f, "{}", e),
 			&ChannelError::Warn(ref e) => write!(f, "{}", e),
 			&ChannelError::Close((ref e, _)) => write!(f, "{}", e),
+			&ChannelError::SendError(ref e) => write!(f, "{}", e),
 		}
 	}
 }

lightning/src/ln/channelmanager.rs

@@ -800,7 +800,7 @@ impl MsgHandleErrInternal {
 					err: msg,
 					action: msgs::ErrorAction::IgnoreError,
 				},
-				ChannelError::Close((msg, _reason)) => LightningError {
+				ChannelError::Close((msg, _)) | ChannelError::SendError(msg) => LightningError {
 					err: msg.clone(),
 					action: msgs::ErrorAction::SendErrorMessage {
 						msg: msgs::ErrorMessage {
@@ -3030,6 +3030,9 @@ macro_rules! convert_channel_err {
 					MsgHandleErrInternal::from_finish_shutdown(msg, *$channel_id, shutdown_res, $channel_update);
 				(true, err)
 			},
+			ChannelError::SendError(msg) => {
+				(false, MsgHandleErrInternal::from_chan_no_close(ChannelError::SendError(msg), *$channel_id))
+			},
 		}
 	};
 	($self: ident, $peer_state: expr, $err: expr, $funded_channel: expr, $channel_id: expr, FUNDED_CHANNEL) => {