fix Minor review changes, error handling and persist flags

Author: optout21

lightning/src/ln/channel.rs

@@ -8280,15 +8280,11 @@ impl<SP: Deref> FundedChannel<SP> where
 			)));
 		}
 
-		if !self.context.is_live() {
-			return Err(ChannelError::Warn(format!("Splicing requested on a channel that is not live")));
-		}
-
 		// - If it has received shutdown:
 		//   MUST send a warning and close the connection or send an error
 		//   and fail the channel.
-		if self.context.channel_state.is_remote_shutdown_sent() {
-			return Err(ChannelError::close("Got splice_init when channel was not in an operational state".to_owned()));
+		if !self.context.is_live() {
+			return Err(ChannelError::Warn(format!("Splicing requested on a channel that is not live")));
 		}
 
 		if their_funding_contribution_satoshis.saturating_add(our_funding_contribution_satoshis) < 0 {

lightning/src/ln/channelmanager.rs

@@ -4272,7 +4272,9 @@ where
 	/// After completion of splicing, the funding transaction will be replaced by a new one, spending the old funding transaction,
 	/// with optional extra inputs (splice-in) and/or extra outputs (splice-out or change).
 	/// TODO(splicing): Implementation is currently incomplete.
+	///
 	/// Note: Currently only splice-in is supported (increase in channel capacity), splice-out is not.
+	///
 	/// - our_funding_contribution_satoshis: the amount contributed by us to the channel. This will increase our channel balance.
 	/// - our_funding_inputs: the funding inputs provided by us. If our contribution is positive, our funding inputs must cover at least that amount.
 	///   Includes the witness weight for this input (e.g. P2WPKH_WITNESS_WEIGHT=109 for typical P2WPKH inputs).
@@ -9499,17 +9501,11 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				), msg.channel_id)),
 			hash_map::Entry::Occupied(mut chan_entry) => {
 				if let Some(chan) = chan_entry.get_mut().as_funded_mut() {
-					match chan.splice_init(msg) {
-						Ok(splice_ack_msg) => {
-							peer_state.pending_msg_events.push(events::MessageSendEvent::SendSpliceAck {
-								node_id: *counterparty_node_id,
-								msg: splice_ack_msg,
-							});
-						},
-						Err(err) => {
-							try_channel_entry!(self, peer_state, Err(err), chan_entry)
-						}
-					}
+					let splice_ack_msg = try_channel_entry!(self, peer_state, chan.splice_init(msg), chan_entry);
+					peer_state.pending_msg_events.push(events::MessageSendEvent::SendSpliceAck {
+						node_id: *counterparty_node_id,
+						msg: splice_ack_msg,
+					});
 				} else {
 					return Err(MsgHandleErrInternal::send_err_msg_no_close("Channel is not funded, cannot be spliced".to_owned(), msg.channel_id));
 				}
@@ -9544,12 +9540,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				), msg.channel_id)),
 			hash_map::Entry::Occupied(mut chan_entry) => {
 				if let Some(chan) = chan_entry.get_mut().as_funded_mut() {
-					match chan.splice_ack(msg) {
-						Ok(_) => {}
-						Err(err) => {
-							try_channel_entry!(self, peer_state, Err(err), chan_entry)
-						}
-					}
+					try_channel_entry!(self, peer_state, chan.splice_ack(msg), chan_entry);
 				} else {
 					return Err(MsgHandleErrInternal::send_err_msg_no_close("Channel is not funded, cannot splice".to_owned(), msg.channel_id));
 				}
@@ -11724,7 +11715,7 @@ where
 			let persist = match &res {
 				Err(e) if e.closes_channel() => NotifyOption::DoPersist,
 				Err(_) => NotifyOption::SkipPersistHandleEvents,
-				Ok(()) => NotifyOption::SkipPersistNoEvents,
+				Ok(()) => NotifyOption::SkipPersistHandleEvents,
 			};
 			let _ = handle_error!(self, res, counterparty_node_id);
 			persist
@@ -11738,7 +11729,7 @@ where
 			let persist = match &res {
 				Err(e) if e.closes_channel() => NotifyOption::DoPersist,
 				Err(_) => NotifyOption::SkipPersistHandleEvents,
-				Ok(()) => NotifyOption::SkipPersistNoEvents,
+				Ok(()) => NotifyOption::SkipPersistHandleEvents,
 			};
 			let _ = handle_error!(self, res, counterparty_node_id);
 			persist