LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-03 02:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

network: minor clean-up

Browse source
This commit is contained in:
SomberNight 2018-11-03 17:11:08 +01:00
parent 908c979338
commit 7a46bd1089
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
electrum/network.py
View file

@ -382,7 +382,11 @@ class Network(PrintError):
def get_parameters(self) -> NetworkParameters: def get_parameters(self) -> NetworkParameters:
host, port, protocol = deserialize_server(self.default_server) host, port, protocol = deserialize_server(self.default_server)
return NetworkParameters(host, port, protocol, self.proxy, self.auto_connect) return NetworkParameters(host=host,
port=port,
protocol=protocol,
proxy=self.proxy,
auto_connect=self.auto_connect)
def get_donation_address(self): def get_donation_address(self):
if self.is_connected(): if self.is_connected():
@ -487,15 +491,16 @@ class Network(PrintError):
try: try:
deserialize_server(serialize_server(host, port, protocol)) deserialize_server(serialize_server(host, port, protocol))
if proxy: if proxy:
proxy_modes.index(proxy["mode"]) + 1 proxy_modes.index(proxy['mode']) + 1
int(proxy['port']) int(proxy['port'])
except: except:
return return
self.config.set_key('auto_connect', net_params.auto_connect, False) self.config.set_key('auto_connect', net_params.auto_connect, False)
self.config.set_key("proxy", proxy_str, False) self.config.set_key('proxy', proxy_str, False)
self.config.set_key("server", server_str, True) self.config.set_key('server', server_str, True)
# abort if changes were not allowed by config # abort if changes were not allowed by config
if self.config.get('server') != server_str or self.config.get('proxy') != proxy_str: if self.config.get('server') != server_str \
or self.config.get('proxy') != proxy_str:
return return
async with self.restart_lock: async with self.restart_lock:
@ -796,6 +801,14 @@ class Network(PrintError):
async def _start(self): async def _start(self):
assert not self.main_taskgroup assert not self.main_taskgroup
self.main_taskgroup = SilentTaskGroup() self.main_taskgroup = SilentTaskGroup()
assert not self.interface and not self.interfaces
assert not self.connecting and not self.server_queue
self.print_error('starting network')
self.disconnected_servers = set([])
self.protocol = deserialize_server(self.default_server)[2]
self.server_queue = queue.Queue()
self._set_proxy(deserialize_proxy(self.config.get('proxy')))
self._start_interface(self.default_server)
async def main(): async def main():
try: try:
@ -808,14 +821,6 @@ class Network(PrintError):
raise e raise e
asyncio.run_coroutine_threadsafe(main(), self.asyncio_loop) asyncio.run_coroutine_threadsafe(main(), self.asyncio_loop)
assert not self.interface and not self.interfaces
assert not self.connecting and not self.server_queue
self.print_error('starting network')
self.disconnected_servers = set([])
self.protocol = deserialize_server(self.default_server)[2]
self.server_queue = queue.Queue()
self._set_proxy(deserialize_proxy(self.config.get('proxy')))
self._start_interface(self.default_server)
self.trigger_callback('network_updated') self.trigger_callback('network_updated')
def start(self, jobs: List=None): def start(self, jobs: List=None):