BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

do not store protocol explicitly

This commit is contained in:
ThomasV 2015-02-28 15:37:50 +01:00
parent f489466709
commit 510934d545
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/network.py
View File

@ -95,23 +95,20 @@ class Network(threading.Thread):
self.blockchain = Blockchain(self.config, self) self.blockchain = Blockchain(self.config, self)
self.interfaces = {} self.interfaces = {}
self.queue = Queue.Queue() self.queue = Queue.Queue()
self.protocol = self.config.get('protocol','s')
# sanitize protocol
if self.protocol not in 'sght': self.protocol = 's'
self.running = False self.running = False
# Server for addresses and transactions # Server for addresses and transactions
self.default_server = self.config.get('server') self.default_server = self.config.get('server')
# Sanitize default server # Sanitize default server
try: try:
host, port, protocol = self.default_server.split(':') host, port, protocol = self.default_server.split(':')
assert protocol == self.protocol assert protocol in 'st'
int(port) int(port)
except: except:
self.default_server = None self.default_server = None
if not self.default_server: if not self.default_server:
self.default_server = pick_random_server(self.protocol) self.default_server = pick_random_server('s')
self.protocol = self.default_server.split(':')[2]
self.irc_servers = {} # returned by interface (list from irc) self.irc_servers = {} # returned by interface (list from irc)
self.disconnected_servers = set([]) self.disconnected_servers = set([])
@ -246,7 +243,6 @@ class Network(threading.Thread):
server_str = ':'.join([ host, port, protocol ]) server_str = ':'.join([ host, port, protocol ])
self.config.set_key('auto_cycle', auto_connect, True) self.config.set_key('auto_cycle', auto_connect, True)
self.config.set_key("proxy", proxy_str, True) self.config.set_key("proxy", proxy_str, True)
self.config.set_key("protocol", protocol, True)
self.config.set_key("server", server_str, True) self.config.set_key("server", server_str, True)
if self.proxy != proxy_str or self.protocol != protocol: if self.proxy != proxy_str or self.protocol != protocol: