Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove smelly code

Browse Source
This commit is contained in:
vrde 2016-04-28 15:46:33 +02:00
parent cd6bb18f18
commit f5da2af872
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bigchaindb/commands/bigchain.py
View File

@ -59,8 +59,6 @@ def run_configure(args, skip_if_exists=False):
skip_if_exists (bool): skip the function if a config file already exists skip_if_exists (bool): skip the function if a config file already exists
""" """
config_path = args.config or bigchaindb.config_utils.CONFIG_DEFAULT_PATH config_path = args.config or bigchaindb.config_utils.CONFIG_DEFAULT_PATH
bigchaindb.config_utils.autoconfigure(filename=False, force=True)
config_file_exists = False config_file_exists = False
# if the config path is `-` then it's stdout # if the config path is `-` then it's stdout
@ -76,9 +74,13 @@ def run_configure(args, skip_if_exists=False):
if want != 'y': if want != 'y':
return return
# Patch the default configuration with the new values
conf = copy.deepcopy(bigchaindb.config) conf = copy.deepcopy(bigchaindb.config)
del conf['CONFIGURED']
# Patch the default configuration with the new values
conf = bigchaindb.config_utils.update(
conf,
bigchaindb.config_utils.env_config(bigchaindb.config))
print('Generating keypair', file=sys.stderr) print('Generating keypair', file=sys.stderr)
conf['keypair']['private'], conf['keypair']['public'] = \ conf['keypair']['private'], conf['keypair']['public'] = \
@ -173,7 +175,6 @@ def run_start(args):
def _run_load(tx_left, stats): def _run_load(tx_left, stats):
logstats.thread.start(stats) logstats.thread.start(stats)
client = temp_client() client = temp_client()
# b = bigchaindb.Bigchain()
while True: while True:
tx = client.create() tx = client.create()

2
bigchaindb/commands/utils.py
View File

@ -54,8 +54,6 @@ def start_rethinkdb():
# The last `line` contains info about the error. # The last `line` contains info about the error.
raise StartupError(line) raise StartupError(line)
proc.kill()
def start(parser, scope): def start(parser, scope):
"""Utility function to execute a subcommand. """Utility function to execute a subcommand.

3
bigchaindb/config_utils.py
View File

@ -92,9 +92,6 @@ def file_config(filename=None):
""" """
logger.debug('On entry into file_config(), filename = {}'.format(filename)) logger.debug('On entry into file_config(), filename = {}'.format(filename))
if filename is False:
return {}
if filename is None: if filename is None:
filename = CONFIG_DEFAULT_PATH filename = CONFIG_DEFAULT_PATH