AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker: LNWallet.start_network to call super().start_network

Browse Source 
The call to super was removed in 4efcb53d24 ,
so that LNWallet's taskgroup would not run _maintain_connectivity, AFAICT.
The way it was done meant that "main_loop" itself would not run for LNWallet, only for LNGossip - very confusing.
It is only due to a quirk in the behaviour of TaskGroups that the group "started" at all.
This commit is contained in:
SomberNight
2022-04-26 19:20:59 +02:00
parent b7dd51612e
commit f10752b523
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/lnworker.py
View File

@@ -266,7 +266,7 @@ class LNWorker(Logger, NetworkRetryManager[LNPeerAddr]):
self.logger.info("starting taskgroup.") self.logger.info("starting taskgroup.")
try: try:
async with self.taskgroup as group: async with self.taskgroup as group:
await group.spawn(self._maintain_connectivity()) await group.spawn(asyncio.Event().wait) # run forever (until cancel)
except Exception as e: except Exception as e:
self.logger.exception("taskgroup died.") self.logger.exception("taskgroup died.")
finally: finally:
@@ -516,9 +516,13 @@ class LNGossip(LNWorker):
self.unknown_ids = set() self.unknown_ids = set()
def start_network(self, network: 'Network'): def start_network(self, network: 'Network'):
assert network
super().start_network(network) super().start_network(network)
asyncio.run_coroutine_threadsafe(self.taskgroup.spawn(self.maintain_db()), self.network.asyncio_loop) for coro in [
self._maintain_connectivity(),
self.maintain_db(),
]:
tg_coro = self.taskgroup.spawn(coro)
asyncio.run_coroutine_threadsafe(tg_coro, self.network.asyncio_loop)
async def maintain_db(self): async def maintain_db(self):
await self.channel_db.data_loaded.wait() await self.channel_db.data_loaded.wait()
@@ -727,9 +731,7 @@ class LNWallet(LNWorker):
await watchtower.add_sweep_tx(outpoint, ctn, tx.inputs()[0].prevout.to_str(), tx.serialize()) await watchtower.add_sweep_tx(outpoint, ctn, tx.inputs()[0].prevout.to_str(), tx.serialize())
def start_network(self, network: 'Network'): def start_network(self, network: 'Network'):
assert network super().start_network(network)
self.network = network
self.config = network.config
self.lnwatcher = LNWalletWatcher(self, network) self.lnwatcher = LNWalletWatcher(self, network)
self.lnwatcher.start_network(network) self.lnwatcher.start_network(network)
self.swap_manager.start_network(network=network, lnwatcher=self.lnwatcher) self.swap_manager.start_network(network=network, lnwatcher=self.lnwatcher)