AaronFiore/electrum
1
0
Fork 0
Code Activity

AddressSynchronizer: set diagnostic_name for better logs

Browse Source 
fixes regression from 121d8732f1

in particular, this is needed for Synchronizer.diagnostic_name and SPV.diagnostic_name
This commit is contained in:
SomberNight
2022-08-24 11:05:01 +00:00
parent dea30f96a1
commit 757ec53ea2
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/address_synchronizer.py
View File

@@ -42,6 +42,7 @@ from .util import EventListener, event_listener
if TYPE_CHECKING: if TYPE_CHECKING:
from .network import Network from .network import Network
from .wallet_db import WalletDB from .wallet_db import WalletDB
from .simple_config import SimpleConfig
TX_HEIGHT_FUTURE = -3 TX_HEIGHT_FUTURE = -3
@@ -66,9 +67,10 @@ class AddressSynchronizer(Logger, EventListener):
synchronizer: Optional['Synchronizer'] synchronizer: Optional['Synchronizer']
verifier: Optional['SPV'] verifier: Optional['SPV']
def __init__(self, db: 'WalletDB', config): def __init__(self, db: 'WalletDB', config: 'SimpleConfig', *, name: str = None):
self.db = db self.db = db
self.config = config self.config = config
self.name = name
self.network = None self.network = None
Logger.__init__(self) Logger.__init__(self)
# verifier (SPV) and synchronizer are started in start_network # verifier (SPV) and synchronizer are started in start_network
@@ -91,6 +93,9 @@ class AddressSynchronizer(Logger, EventListener):
self.load_and_cleanup() self.load_and_cleanup()
def diagnostic_name(self):
return self.name or ""
def with_transaction_lock(func): def with_transaction_lock(func):
def func_wrapper(self: 'AddressSynchronizer', *args, **kwargs): def func_wrapper(self: 'AddressSynchronizer', *args, **kwargs):
with self.transaction_lock: with self.transaction_lock:

2
electrum/lnwatcher.py
View File

@@ -325,7 +325,7 @@ class WatchTower(LNWatcher):
LOGGING_SHORTCUT = 'W' LOGGING_SHORTCUT = 'W'
def __init__(self, network): def __init__(self, network):
adb = AddressSynchronizer(WalletDB({}, manual_upgrades=False), network.config) adb = AddressSynchronizer(WalletDB({}, manual_upgrades=False), network.config, name=self.diagnostic_name())
adb.start_network(network) adb.start_network(network)
LNWatcher.__init__(self, adb, network) LNWatcher.__init__(self, adb, network)
self.network = network self.network = network

2
electrum/wallet.py
View File

@@ -318,7 +318,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
Logger.__init__(self) Logger.__init__(self)
self.network = None self.network = None
self.adb = AddressSynchronizer(db, config) self.adb = AddressSynchronizer(db, config, name=self.diagnostic_name())
for addr in self.get_addresses(): for addr in self.get_addresses():
self.adb.add_address(addr) self.adb.add_address(addr)
self.lock = self.adb.lock self.lock = self.adb.lock