fix Persist flag simplification in splice_channel

Author: optout21

lightning/src/ln/channelmanager.rs

@@ -4287,13 +4287,13 @@ where
 		&self, channel_id: &ChannelId, counterparty_node_id: &PublicKey, our_funding_contribution_satoshis: i64,
 		our_funding_inputs: &Vec<(TxIn, Transaction, Weight)>,
 		funding_feerate_per_kw: u32, locktime: Option<u32>,
-	) -> (Result<(), APIError>, NotifyOption) {
+	) -> Result<(), APIError> {
 		let per_peer_state = self.per_peer_state.read().unwrap();
 
 		let peer_state_mutex = match per_peer_state.get(counterparty_node_id)
 			.ok_or_else(|| APIError::ChannelUnavailable { err: format!("Can't find a peer matching the passed counterparty node_id {}", counterparty_node_id) }) {
 			Ok(p) => p,
-			Err(e) => return (Err(e), NotifyOption::SkipPersistNoEvents),
+			Err(e) => return Err(e),
 		};
 
 		let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -4306,31 +4306,31 @@ where
 				if let Some(chan) = chan_phase_entry.get_mut().as_funded_mut() {
 					let msg = match chan.splice_channel(our_funding_contribution_satoshis, our_funding_inputs, funding_feerate_per_kw, locktime) {
 						Ok(m) => m,
-						Err(e) => return (Err(e), NotifyOption::SkipPersistNoEvents),
+						Err(e) => return Err(e),
 					};
 
 					peer_state.pending_msg_events.push(events::MessageSendEvent::SendSpliceInit {
 						node_id: *counterparty_node_id,
 						msg,
 					});
 
-					(Ok(()), NotifyOption::SkipPersistHandleEvents)
+					Ok(())
 				} else {
-					(Err(APIError::ChannelUnavailable {
+					Err(APIError::ChannelUnavailable {
 						err: format!(
 							"Channel with id {} is not funded, cannot splice it",
 							channel_id
 						)
-					}), NotifyOption::SkipPersistNoEvents)
+					})
 				}
 			},
 			hash_map::Entry::Vacant(_) => {
-				(Err(APIError::ChannelUnavailable {
+				Err(APIError::ChannelUnavailable {
 					err: format!(
 						"Channel with id {} not found for the passed counterparty node_id {}",
 						channel_id, counterparty_node_id,
 					)
-				}), NotifyOption::SkipPersistNoEvents)
+				})
 			},
 		}
 	}
@@ -4354,11 +4354,14 @@ where
 	) -> Result<(), APIError> {
 		let mut res = Ok(());
 		PersistenceNotifierGuard::optionally_notify(self, || {
-			let (result, notify_option) = self.internal_splice_channel(
+			let result = self.internal_splice_channel(
 				channel_id, counterparty_node_id, our_funding_contribution_satoshis, &our_funding_inputs, funding_feerate_per_kw, locktime
 			);
 			res = result;
-			notify_option
+			match res {
+				Ok(_) => NotifyOption::SkipPersistHandleEvents,
+				Err(_) => NotifyOption::SkipPersistNoEvents,
+			}
 		});
 		res
 	}