AaronFiore/electrum
1
0
Fork 0
Code Activity

network: "switch unwanted fork" should check what fork we are on..

Browse Source 
follow-up #4767
This commit is contained in:
SomberNight
2018-10-14 04:23:10 +02:00
parent 1af225015a
commit 0e59bc1bc5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/network.py
View File

@@ -533,13 +533,15 @@ class Network(PrintError):
"""If auto_connect and main interface is not on preferred fork, """If auto_connect and main interface is not on preferred fork,
try to switch to preferred fork. try to switch to preferred fork.
""" """
if not self.auto_connect: if not self.auto_connect or not self.interface:
return return
with self.interfaces_lock: interfaces = list(self.interfaces.values()) with self.interfaces_lock: interfaces = list(self.interfaces.values())
# try to switch to preferred fork # try to switch to preferred fork
if self._blockchain_preferred_block: if self._blockchain_preferred_block:
pref_height = self._blockchain_preferred_block['height'] pref_height = self._blockchain_preferred_block['height']
pref_hash = self._blockchain_preferred_block['hash'] pref_hash = self._blockchain_preferred_block['hash']
if self.interface.blockchain.check_hash(pref_height, pref_hash):
return # already on preferred fork
filtered = list(filter(lambda iface: iface.blockchain.check_hash(pref_height, pref_hash), filtered = list(filter(lambda iface: iface.blockchain.check_hash(pref_height, pref_hash),
interfaces)) interfaces))
if filtered: if filtered: