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

Move some default values to config.py

Browse Source
This commit is contained in:
tecnovert
2020-02-01 20:57:20 +02:00
parent 388ada154e
commit 0a2c6dafb7
8 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/basicswap_prepare.py
View File

@@ -249,7 +249,7 @@ def printHelp():
logger.info('Usage: basicswap-prepare ')
logger.info('\n--help, -h Print help.')
logger.info('--version, -v Print version.')
logger.info('--datadir=PATH Path to basicswap data directory, default:~/.basicswap.')
logger.info('--datadir=PATH Path to basicswap data directory, default:{}.'.format(cfg.DEFAULT_DATADIR))
logger.info('--bindir=PATH Path to cores directory, default:datadir/bin.')
logger.info('--mainnet Run in mainnet mode.')
logger.info('--testnet Run in testnet mode.')
@@ -374,8 +374,7 @@ def main():
exitWithError('Unknown argument {}'.format(v))
if data_dir is None:
default_datadir = '~/.basicswap'
data_dir = os.path.join(os.path.expanduser(default_datadir))
data_dir = os.path.join(os.path.expanduser(cfg.DEFAULT_DATADIR))
if bin_dir is None:
bin_dir = os.path.join(data_dir, 'bin')
@@ -387,7 +386,7 @@ def main():
if not os.path.exists(data_dir):
os.makedirs(data_dir)
config_path = os.path.join(data_dir, 'basicswap.json')
config_path = os.path.join(data_dir, cfg.CONFIG_FILENAME)
withchainclients = {}
chainclients = {

8
bin/basicswap_run.py
View File

@@ -19,6 +19,7 @@ import signal
import subprocess
import logging
import basicswap.config as cfg
from basicswap import __version__
from basicswap.basicswap import BasicSwap
from basicswap.http_server import HttpThread
@@ -50,7 +51,7 @@ def startDaemon(node_dir, bin_dir, daemon_bin, opts=[]):
def runClient(fp, data_dir, chain):
global swap_client
settings_path = os.path.join(data_dir, 'basicswap.json')
settings_path = os.path.join(data_dir, cfg.CONFIG_FILENAME)
pids_path = os.path.join(data_dir, '.pids')
if not os.path.exists(settings_path):
@@ -153,7 +154,7 @@ def printHelp():
logger.info('Usage: basicswap-run ')
logger.info('\n--help, -h Print help.')
logger.info('--version, -v Print version.')
logger.info('--datadir=PATH Path to basicswap data directory, default:~/.basicswap.')
logger.info('--datadir=PATH Path to basicswap data directory, default:{}.'.format(cfg.DEFAULT_DATADIR))
logger.info('--mainnet Run in mainnet mode.')
logger.info('--testnet Run in testnet mode.')
logger.info('--regtest Run in regtest mode.')
@@ -197,8 +198,7 @@ def main():
logger.warning('Unknown argument %s', v)
if data_dir is None:
default_datadir = '~/.basicswap'
data_dir = os.path.join(os.path.expanduser(default_datadir))
data_dir = os.path.join(os.path.expanduser(cfg.DEFAULT_DATADIR))
logger.info('Using datadir: %s', data_dir)
logger.info('Chain: %s', chain)