From: Matt Corallo <git@bluematt.me>
Date: Wed, 29 Nov 2023 06:02:46 +0000 (+0000)
Subject: Immediately error in `close_channel_internal` if there is no chan
X-Git-Tag: v0.0.119~19^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2F2023-11-chan-close-loop;p=rust-lightning

Immediately error in `close_channel_internal` if there is no chan

Previously, unfunded channels would be stored outside of
`PeerState::channel_by_id`, and thus if there is no channel when
we look in `PeerState::channel_by_id`, `close_channel_internal`
called `force_close_channel_with_peer` to hunt for unfunded
channels.

However, that is no longer the case, so the call is redundant, and
we can simply return an error instead.
---

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index a74dbbfe4..7c6ee1e42 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -2758,13 +2758,12 @@ where
 					}
 				},
 				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,
+						)
+					});
 				},
 			}
 		}