AaronFiore/electrum
1
0
Fork 0
Code Activity

fix wrong call to request_force_close_from_backup, make it private

Browse Source
This commit is contained in:
ThomasV
2021-03-25 12:26:23 +01:00
parent 6491421930
commit 4b870f15a7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/kivy/uix/dialogs/lightning_channels.py
View File

@@ -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)

2
electrum/gui/qt/channels_list.py
View File

@@ -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)

4
electrum/lnworker.py
View File

@@ -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}')