From 4b870f15a7dae083cb95e50b8c89c3407a612c0e Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 25 Mar 2021 12:26:23 +0100 Subject: [PATCH] fix wrong call to request_force_close_from_backup, make it private --- electrum/gui/kivy/uix/dialogs/lightning_channels.py | 4 ++-- electrum/gui/qt/channels_list.py | 2 +- electrum/lnworker.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/electrum/gui/kivy/uix/dialogs/lightning_channels.py b/electrum/gui/kivy/uix/dialogs/lightning_channels.py index fb0ea521b..082542a0d 100644 --- a/electrum/gui/kivy/uix/dialogs/lightning_channels.py +++ b/electrum/gui/kivy/uix/dialogs/lightning_channels.py @@ -439,7 +439,7 @@ class ChannelBackupPopup(Popup, Logger): if not b: return loop = self.app.wallet.network.asyncio_loop - coro = asyncio.run_coroutine_threadsafe(self.app.wallet.lnworker.request_force_close_from_backup(self.chan.channel_id), loop) + coro = asyncio.run_coroutine_threadsafe(self.app.wallet.lnworker.request_force_close(self.chan.channel_id), loop) try: coro.result(5) self.app.show_info(_('Request sent')) @@ -506,7 +506,7 @@ class ChannelDetailsPopup(Popup, Logger): def _close(self, choice): loop = self.app.wallet.network.asyncio_loop if choice == 1: - coro = self.app.wallet.lnworker.request_force_close_from_backup(self.chan.channel_id) + coro = self.app.wallet.lnworker.request_force_close(self.chan.channel_id) msg = _('Request sent') else: coro = self.app.wallet.lnworker.close_channel(self.chan.channel_id) diff --git a/electrum/gui/qt/channels_list.py b/electrum/gui/qt/channels_list.py index 827eb1d2f..6d0798a6e 100644 --- a/electrum/gui/qt/channels_list.py +++ b/electrum/gui/qt/channels_list.py @@ -180,7 +180,7 @@ class ChannelsList(MyTreeView): def request_force_close(self, channel_id): def task(): - coro = self.lnworker.request_force_close_from_backup(channel_id) + coro = self.lnworker.request_force_close(channel_id) return self.network.run_from_another_thread(coro) WaitingDialog(self, 'please wait..', task, self.on_request_sent, self.on_failure) diff --git a/electrum/lnworker.py b/electrum/lnworker.py index 58adc2d71..e7e710cb4 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -2077,7 +2077,7 @@ class LNWallet(LNWorker): peer = await self.add_peer(connect_str) await peer.trigger_force_close(channel_id) elif channel_id in self.channel_backups: - await self.request_force_close_from_backup(channel_id) + await self._request_force_close_from_backup(channel_id) else: raise Exception(f'Unknown channel {channel_id.hex()}') @@ -2117,7 +2117,7 @@ class LNWallet(LNWorker): util.trigger_callback('channels_updated', self.wallet) @log_exceptions - async def request_force_close_from_backup(self, channel_id: bytes): + async def _request_force_close_from_backup(self, channel_id: bytes): cb = self.channel_backups.get(channel_id) if not cb: raise Exception(f'channel backup not found {self.channel_backups}')