AaronFiore/electrum
1
0
Fork 0
Code Activity

cleanup code in network.py

Browse Source
This commit is contained in:
thomasv
2013-12-16 17:37:32 +01:00
parent 0bba8e4549
commit c7694a87e7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/network.py
View File

@@ -94,12 +94,12 @@ class Network(threading.Thread):
if message not in self.subscriptions[callback]: if message not in self.subscriptions[callback]:
self.subscriptions[callback].append(message) self.subscriptions[callback].append(message)
if self.interface and self.interface.is_connected: if self.is_connected():
self.interface.send( messages, callback ) self.interface.send( messages, callback )
def send(self, messages, callback): def send(self, messages, callback):
if self.interface and self.interface.is_connected: if self.is_connected():
self.interface.send( messages, callback ) self.interface.send( messages, callback )
return True return True
else: else:
@@ -162,14 +162,10 @@ class Network(threading.Thread):
def start_interfaces(self): def start_interfaces(self):
self.interface = self.start_interface(self.default_server) self.interface = self.start_interface(self.default_server)
#self.interface = self.interfaces[self.default_server]
for i in range(self.num_server): for i in range(self.num_server):
self.start_random_interface() self.start_random_interface()
if not self.interface:
self.interface = self.interfaces.values()[0]
def start(self, wait=False): def start(self, wait=False):
self.start_interfaces() self.start_interfaces()
@@ -180,9 +176,8 @@ class Network(threading.Thread):
def wait_until_connected(self): def wait_until_connected(self):
while not self.interface: while not self.is_connected():
time.sleep(1) time.sleep(1)
self.interface.connect_event.wait()
def set_parameters(self, host, port, protocol, proxy, auto_connect): def set_parameters(self, host, port, protocol, proxy, auto_connect):