AaronFiore/electrum
1
0
Fork 0
Code Activity

network.NetworkParameters: merge host+port+protocol into "server" field

Browse Source
This commit is contained in:
SomberNight
2020-04-16 20:30:53 +02:00
parent adc3784bc2
commit b2cfaddff2
7 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/gui/text.py
View File

@@ -409,7 +409,7 @@ class ElectrumGui:
if not self.network:
return
net_params = self.network.get_parameters()
host, port, protocol = net_params.host, net_params.port, net_params.protocol
server_addr = net_params.server
proxy_config, auto_connect = net_params.proxy, net_params.auto_connect
srv = 'auto-connect' if auto_connect else str(self.network.default_server)
out = self.run_dialog('Network', [
@@ -426,12 +426,11 @@ class ElectrumGui:
except Exception:
self.show_message("Error:" + server_str + "\nIn doubt, type \"auto-connect\"")
return False
host = server_addr.host
port = str(server_addr.port)
protocol = server_addr.protocol
if out.get('server') or out.get('proxy'):
proxy = electrum.network.deserialize_proxy(out.get('proxy')) if out.get('proxy') else proxy_config
net_params = NetworkParameters(host, port, protocol, proxy, auto_connect)
net_params = NetworkParameters(server=server_addr,
proxy=proxy,
auto_connect=auto_connect)
self.network.run_from_another_thread(self.network.set_parameters(net_params))
def settings_dialog(self):