tnetwork: ensure there is a main interface - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit da9d1e6001e3d1133901f5c2b4f16ba1b7a177e0
DIR parent 7dd4032cce0100bc7e23c7b7fec84a7980fee274
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Mon, 1 Oct 2018 18:16:37 +0200
network: ensure there is a main interface
scenario with previous code:
auto_connect enabled, there is only one server in regtest environment.
client started before server; client would not switch to server after it is started.
Diffstat:
M electrum/network.py | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
---
DIR diff --git a/electrum/network.py b/electrum/network.py
t@@ -813,6 +813,22 @@ class Network(PrintError):
def join(self):
self._thread.join(1)
+ async def _ensure_there_is_a_main_interface(self):
+ if self.is_connected():
+ return
+ now = time.time()
+ # if auto_connect is set, try a different server
+ if self.auto_connect and not self.is_connecting():
+ await self._switch_to_random_interface()
+ # if auto_connect is not set, or still no main interface, retry current
+ if not self.is_connected() and not self.is_connecting():
+ if self.default_server in self.disconnected_servers:
+ if now - self.server_retry_time > SERVER_RETRY_INTERVAL:
+ self.disconnected_servers.remove(self.default_server)
+ self.server_retry_time = now
+ else:
+ await self.switch_to_interface(self.default_server)
+
async def _maintain_sessions(self):
while True:
# launch already queued up new interfaces
t@@ -830,18 +846,8 @@ class Network(PrintError):
self.nodes_retry_time = now
# main interface
- if not self.is_connected():
- if self.auto_connect:
- if not self.is_connecting():
- await self._switch_to_random_interface()
- else:
- if self.default_server in self.disconnected_servers:
- if now - self.server_retry_time > SERVER_RETRY_INTERVAL:
- self.disconnected_servers.remove(self.default_server)
- self.server_retry_time = now
- else:
- await self.switch_to_interface(self.default_server)
- else:
+ await self._ensure_there_is_a_main_interface()
+ if self.is_connected():
if self.config.is_fee_estimates_update_required():
await self.interface.group.spawn(self._request_fee_estimates, self.interface)