AaronFiore/electrum
1
0
Fork 0
Code Activity

bitcoin.NetworkConstants: easier changing between testnet and mainnet

Browse Source
This commit is contained in:
SomberNight
2017-11-09 17:47:57 +01:00
parent b4bea48b22
commit 0db5ea67a0
9 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/network.py
View File

@@ -66,7 +66,7 @@ def parse_servers(result):
for v in item[2]:
if re.match("[st]\d*", v):
protocol, port = v[0], v[1:]
if port == '': port = bitcoin.DEFAULT_PORTS[protocol]
if port == '': port = bitcoin.NetworkConstants.DEFAULT_PORTS[protocol]
out[protocol] = port
elif re.match("v(.?)+", v):
version = v[1:]
@@ -100,7 +100,7 @@ def filter_protocol(hostmap, protocol = 's'):
def pick_random_server(hostmap = None, protocol = 's', exclude_set = set()):
if hostmap is None:
hostmap = bitcoin.DEFAULT_SERVERS
hostmap = bitcoin.NetworkConstants.DEFAULT_SERVERS
eligible = list(set(filter_protocol(hostmap, protocol)) - exclude_set)
return random.choice(eligible) if eligible else None
@@ -363,7 +363,7 @@ class Network(util.DaemonThread):
return list(self.interfaces.keys())
def get_servers(self):
out = bitcoin.DEFAULT_SERVERS
out = bitcoin.NetworkConstants.DEFAULT_SERVERS
if self.irc_servers:
out.update(filter_version(self.irc_servers.copy()))
else:
@@ -947,7 +947,7 @@ class Network(util.DaemonThread):
def init_headers_file(self):
b = self.blockchains[0]
if b.get_hash(0) == bitcoin.GENESIS:
if b.get_hash(0) == bitcoin.NetworkConstants.GENESIS:
self.downloading_headers = False
return
filename = b.path()
@@ -955,8 +955,8 @@ class Network(util.DaemonThread):
try:
import urllib.request, socket
socket.setdefaulttimeout(30)
self.print_error("downloading ", bitcoin.HEADERS_URL)
urllib.request.urlretrieve(bitcoin.HEADERS_URL, filename + '.tmp')
self.print_error("downloading ", bitcoin.NetworkConstants.HEADERS_URL)
urllib.request.urlretrieve(bitcoin.NetworkConstants.HEADERS_URL, filename + '.tmp')
os.rename(filename + '.tmp', filename)
self.print_error("done.")
except Exception: