LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 09:45:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

delete channel from db in remove_channel, becaose it is called from lnworker

Browse source
This commit is contained in:
ThomasV 2019-10-23 08:20:15 +02:00
parent 9fbac40d56
commit a4944cdcb2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
electrum/channel_db.py
View file

@ -508,7 +508,6 @@ class ChannelDB(SqlDB):
if l: if l:
for short_channel_id in l: for short_channel_id in l:
self.remove_channel(short_channel_id) self.remove_channel(short_channel_id)
self.delete_channel(short_channel_id)
self.update_counts() self.update_counts()
self.logger.info(f'Deleting {len(l)} orphaned channels') self.logger.info(f'Deleting {len(l)} orphaned channels')
@ -524,6 +523,8 @@ class ChannelDB(SqlDB):
if channel_info: if channel_info:
self._channels_for_node[channel_info.node1_id].remove(channel_info.short_channel_id) self._channels_for_node[channel_info.node1_id].remove(channel_info.short_channel_id)
self._channels_for_node[channel_info.node2_id].remove(channel_info.short_channel_id) self._channels_for_node[channel_info.node2_id].remove(channel_info.short_channel_id)
# delete from database
self.delete_channel(short_channel_id)
def get_node_addresses(self, node_id): def get_node_addresses(self, node_id):
return self._addresses.get(node_id) return self._addresses.get(node_id)

1
electrum/lnworker.py
View file

@ -864,6 +864,7 @@ class LNWallet(LNWorker):
short_channel_id = route[0].short_channel_id short_channel_id = route[0].short_channel_id
chan = self.get_channel_by_short_id(short_channel_id) chan = self.get_channel_by_short_id(short_channel_id)
if not chan: if not chan:
self.channel_db.remove_channel(short_channel_id)
raise Exception(f"PathFinder returned path with short_channel_id " raise Exception(f"PathFinder returned path with short_channel_id "
f"{short_channel_id} that is not in channel list") f"{short_channel_id} that is not in channel list")
self.set_payment_status(lnaddr.paymenthash, PR_INFLIGHT) self.set_payment_status(lnaddr.paymenthash, PR_INFLIGHT)