AaronFiore/electrum
1
0
Fork 0
Code Activity

Make is_connected into a member function. No change in logic.

Browse Source
This commit is contained in:
Neil Booth
2015-05-05 14:53:07 +09:00
parent 5e2e82d516
commit 9cf2eff16b
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/network.py
View File

@@ -206,7 +206,7 @@ class Network(util.DaemonThread):
self.notify('status')
def is_connected(self):
return self.interface and self.interface.is_connected
return self.interface and self.interface.is_connected()
def send_subscriptions(self):
for addr in self.addresses:
@@ -322,7 +322,7 @@ class Network(util.DaemonThread):
return
if auto_connect:
if not self.interface.is_connected:
if not self.interface.is_connected():
self.switch_to_random_interface()
else:
if self.server_is_lagging():
@@ -335,7 +335,7 @@ class Network(util.DaemonThread):
def switch_to_random_interface(self):
while self.interfaces:
i = random.choice(self.interfaces.values())
if i.is_connected:
if i.is_connected():
self.switch_to_interface(i)
break
else:
@@ -356,14 +356,14 @@ class Network(util.DaemonThread):
def set_server(self, server):
if self.default_server == server and self.interface.is_connected:
if self.default_server == server and self.interface.is_connected():
return
if self.protocol != deserialize_server(server)[2]:
return
# stop the interface in order to terminate subscriptions
if self.interface.is_connected:
if self.interface.is_connected():
self.stop_interface()
# notify gui
@@ -474,7 +474,7 @@ class Network(util.DaemonThread):
self.print_error('network: retrying connections')
self.disconnected_servers = set([])
nodes_retry_time = now
if not self.interface.is_connected:
if not self.interface.is_connected():
if self.config.get('auto_cycle'):
if self.interfaces:
self.switch_to_random_interface()
@@ -500,7 +500,7 @@ class Network(util.DaemonThread):
if i.server in self.pending_servers:
self.pending_servers.remove(i.server)
if i.is_connected:
if i.is_connected():
self.add_interface(i)
self.add_recent_server(i)
i.send_request({'method':'blockchain.headers.subscribe','params':[]})