X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=7c6ee1e429c1d1a325759d22c0a73207fa50d730;hb=b530cdc25227acf512b6cf32ac4fcf815c67dff9;hp=37a9a886acc071f948bede16aaa702faaf2037bd;hpb=6ab56a40bebe88498dbbc42812ecc493d9553ae3;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 37a9a886a..7c6ee1e42 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -2714,9 +2714,10 @@ where
 	fn close_channel_internal(&self, channel_id: &ChannelId, counterparty_node_id: &PublicKey, target_feerate_sats_per_1000_weight: Option<u32>, override_shutdown_script: Option<ShutdownScript>) -> Result<(), APIError> {
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);
 
-		let mut failed_htlcs: Vec<(HTLCSource, PaymentHash)>;
-		let shutdown_result;
-		loop {
+		let mut failed_htlcs: Vec<(HTLCSource, PaymentHash)> = Vec::new();
+		let mut shutdown_result = None;
+
+		{
 			let per_peer_state = self.per_peer_state.read().unwrap();
 
 			let peer_state_mutex = per_peer_state.get(counterparty_node_id)
@@ -2730,11 +2731,9 @@ where
 					if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
 						let funding_txo_opt = chan.context.get_funding_txo();
 						let their_features = &peer_state.latest_features;
-						let (shutdown_msg, mut monitor_update_opt, htlcs, local_shutdown_result) =
+						let (shutdown_msg, mut monitor_update_opt, htlcs) =
 							chan.get_shutdown(&self.signer_provider, their_features, target_feerate_sats_per_1000_weight, override_shutdown_script)?;
 						failed_htlcs = htlcs;
-						shutdown_result = local_shutdown_result;
-						debug_assert_eq!(shutdown_result.is_some(), chan.is_shutdown());
 
 						// We can send the `shutdown` message before updating the `ChannelMonitor`
 						// here as we don't need the monitor update to complete until we send a
@@ -2751,30 +2750,20 @@ where
 						if let Some(monitor_update) = monitor_update_opt.take() {
 							handle_new_monitor_update!(self, funding_txo_opt.unwrap(), monitor_update,
 								peer_state_lock, peer_state, per_peer_state, chan);
-							break;
 						}
-
-						if chan.is_shutdown() {
-							if let ChannelPhase::Funded(chan) = remove_channel_phase!(self, chan_phase_entry) {
-								if let Ok(channel_update) = self.get_channel_update_for_broadcast(&chan) {
-									peer_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
-										msg: channel_update
-									});
-								}
-								self.issue_channel_close_events(&chan.context, ClosureReason::HolderForceClosed);
-							}
-						}
-						break;
+					} else {
+						self.issue_channel_close_events(chan_phase_entry.get().context(), ClosureReason::HolderForceClosed);
+						let mut chan_phase = remove_channel_phase!(self, chan_phase_entry);
+						shutdown_result = Some(chan_phase.context_mut().force_shutdown(false));
 					}
 				},
 				hash_map::Entry::Vacant(_) => {
-					// If we reach this point, it means that the channel_id either refers to an unfunded channel or
-					// it does not exist for this peer. Either way, we can attempt to force-close it.
-					//
-					// An appropriate error will be returned for non-existence of the channel if that's the case.
-					mem::drop(peer_state_lock);
-					mem::drop(per_peer_state);
-					return self.force_close_channel_with_peer(&channel_id, counterparty_node_id, None, false).map(|_| ())
+					return Err(APIError::ChannelUnavailable {
+						err: format!(
+							"Channel with id {} not found for the passed counterparty node_id {}",
+							channel_id, counterparty_node_id,
+						)
+					});
 				},
 			}
 		}