From 1613736b45d03e8a8d23a503012df730e22db6e4 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 10 Jun 2022 17:13:11 +0200 Subject: [PATCH] lnpeer: rename trigger_force_close to request_force_close for more consistent naming with rest of the code --- electrum/lnpeer.py | 5 +++-- electrum/lnworker.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/electrum/lnpeer.py b/electrum/lnpeer.py index 459c85be4..bf3144f41 100644 --- a/electrum/lnpeer.py +++ b/electrum/lnpeer.py @@ -1049,7 +1049,8 @@ class Peer(Logger): chan.set_state(ChannelState.OPENING) self.lnworker.add_new_channel(chan) - async def trigger_force_close(self, channel_id: bytes): + async def request_force_close(self, channel_id: bytes): + """Try to trigger the remote peer to force-close.""" await self.initialized # First, we intentionally send a "channel_reestablish" msg with an old state. # Many nodes (but not all) automatically force-close when seeing this. @@ -1193,7 +1194,7 @@ class Peer(Logger): chan_id = chan.channel_id if chan.should_request_force_close: chan.set_state(ChannelState.REQUESTED_FCLOSE) - await self.trigger_force_close(chan_id) + await self.request_force_close(chan_id) chan.should_request_force_close = False return assert ChannelState.PREOPENING < chan.get_state() < ChannelState.FORCE_CLOSING diff --git a/electrum/lnworker.py b/electrum/lnworker.py index 5458e7643..de58ce6d2 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -2440,7 +2440,7 @@ class LNWallet(LNWorker): peer.close_and_cleanup() elif connect_str: peer = await self.add_peer(connect_str) - await peer.trigger_force_close(channel_id) + await peer.request_force_close(channel_id) elif channel_id in self.channel_backups: await self._request_force_close_from_backup(channel_id) else: @@ -2516,7 +2516,7 @@ class LNWallet(LNWorker): try: async with OldTaskGroup(wait=any) as group: await group.spawn(peer._message_loop()) - await group.spawn(peer.trigger_force_close(channel_id)) + await group.spawn(peer.request_force_close(channel_id)) return except Exception as e: self.logger.info(f'failed to connect {host} {e}')