AaronFiore/electrum
1
0
Fork 0
Code Activity

move 'peers.subscribe' and 'server.version' calls into the interface

Browse Source
This commit is contained in:
ThomasV
2012-10-27 14:15:03 +02:00
parent 18c9c2f369
commit cfb3aa6a12
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/wallet.py
View File

@@ -873,7 +873,6 @@ class WalletSynchronizer(threading.Thread):
self.interface.send([('server.banner',[])],'synchronizer')
# subscriptions
self.interface.send([('server.peers.subscribe',[])],'synchronizer')
self.subscribe_to_addresses(self.wallet.all_addresses())
while True:
@@ -907,27 +906,6 @@ class WalletSynchronizer(threading.Thread):
self.wallet.tx_result = result
self.wallet.tx_event.set()
elif method == 'server.version':
pass
elif method == 'server.peers.subscribe':
servers = []
for item in result:
s = []
host = item[1]
ports = []
version = None
if len(item) > 2:
for v in item[2]:
if re.match("[stgh]\d+", v):
ports.append((v[0], v[1:]))
if re.match("v(.?)+", v):
version = v[1:]
if ports and version:
servers.append((host, ports))
self.interface.servers = servers
self.interface.trigger_callback('peers')
elif method == 'server.banner':
self.wallet.banner = result
self.wallet.was_updated = True