midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 10:28:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix testnet mode, expanduser on paths.

Browse Source
This commit is contained in:
tecnovert
2019-07-23 16:26:37 +02:00
parent 5bfcdd469b
commit e039d90bee
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/basicswap_prepare.py
View File

@@ -92,14 +92,14 @@ def prepareCore(coin, version, settings, data_dir):
elif coin == 'litecoin':
signing_key_name = 'thrasher'
release_url = 'https://download.litecoin.org/litecoin-{}/{}/{}'.format(version, os_name, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.',1)[0])
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/litecoin-project/gitian.sigs.ltc/master/%s-%s/%s/%s' % (version, os_name, signing_key_name, assert_filename)
assert_sig_filename = assert_filename + '.sig'
assert_sig_url = assert_url + '.sig'
elif coin == 'bitcoin':
signing_key_name = 'laanwj'
release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.',1)[0])
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/bitcoin-core/gitian.sigs/master/%s-%s/%s/%s' % (version, os_name, signing_key_name, assert_filename)
assert_sig_filename = assert_filename + '.sig'
assert_sig_url = assert_url + '.sig'
@@ -331,7 +331,11 @@ def main():
with open(core_conf_path, 'w') as fp:
if chain != 'mainnet':
fp.write(chain + '=1\n\n')
fp.write(chain + '=1\n')
if chain == 'testnet':
fp.write('[test]\n\n')
else:
logger.warning('Unknown chain %s', chain)
fp.write('rpcport={}\n'.format(core_settings['rpcport']))
fp.write('printtoconsole=0\n')

4
bin/basicswap_run.py
View File

@@ -44,9 +44,9 @@ def signal_handler(sig, frame):
def startDaemon(node_dir, bin_dir, daemon_bin, opts=[]):
daemon_bin = os.path.join(bin_dir, daemon_bin)
daemon_bin = os.path.expanduser(os.path.join(bin_dir, daemon_bin))
args = [daemon_bin, '-datadir=' + node_dir] + opts
args = [daemon_bin, '-datadir=' + os.path.expanduser(node_dir)] + opts
logger.info('Starting node ' + daemon_bin + ' ' + '-datadir=' + node_dir)
return subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)