From a6c36b8588796f5295b793da321c4a24950d6c29 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Tue, 18 Apr 2023 02:02:07 +0000 Subject: [PATCH] regtests: test_watchtower started failing due to newly exposed bug local_watchtower.adb.start_network was getting called twice. follow-up 6ac3f84095f1b0c3d501a45c25633e2e3ab33a40 ``` 20230418T014725.636141Z | ERROR | __main__ | Traceback (most recent call last): File "/home/user/wspace/electrum/./run_electrum", line 435, in main handle_cmd( File "/home/user/wspace/electrum/./run_electrum", line 469, in handle_cmd d = daemon.Daemon(config, fd) File "/home/user/wspace/electrum/electrum/util.py", line 462, in return lambda *args, **kw_args: do_profile(args, kw_args) File "/home/user/wspace/electrum/electrum/util.py", line 458, in do_profile o = func(*args, **kw_args) File "/home/user/wspace/electrum/electrum/daemon.py", line 404, in __init__ self.network = Network(config, daemon=self) File "/home/user/wspace/electrum/electrum/network.py", line 348, in __init__ self.local_watchtower.adb.start_network(self) File "/home/user/wspace/electrum/electrum/address_synchronizer.py", line 185, in start_network assert self.network is None, "already started" AssertionError: already started ``` --- electrum/lnwatcher.py | 2 +- electrum/network.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/electrum/lnwatcher.py b/electrum/lnwatcher.py index deeb46492..020407878 100644 --- a/electrum/lnwatcher.py +++ b/electrum/lnwatcher.py @@ -324,7 +324,7 @@ class WatchTower(LNWatcher): LOGGING_SHORTCUT = 'W' - def __init__(self, network): + def __init__(self, network: 'Network'): adb = AddressSynchronizer(WalletDB({}, manual_upgrades=False), network.config, name=self.diagnostic_name()) adb.start_network(network) LNWatcher.__init__(self, adb, network) diff --git a/electrum/network.py b/electrum/network.py index b288a5578..e77836a95 100644 --- a/electrum/network.py +++ b/electrum/network.py @@ -345,7 +345,6 @@ class Network(Logger, NetworkRetryManager[ServerAddr]): if self.config.get('run_watchtower', False): from . import lnwatcher self.local_watchtower = lnwatcher.WatchTower(self) - self.local_watchtower.adb.start_network(self) asyncio.ensure_future(self.local_watchtower.start_watching()) def has_internet_connection(self) -> bool: