This commit is contained in:
ThomasV 2017-10-09 11:54:17 +02:00
parent 26becedfb2
commit 3f3d249ed1
2 changed files with 8 additions and 4 deletions

View File

@ -288,10 +288,12 @@ def run_offline_command(config, config_options):
# decode json arguments # decode json arguments
args = list(map(json_decode, args)) args = list(map(json_decode, args))
# options # options
args += [(config_options.get(x) if x in ['password', 'new_password'] else config.get(x)) for x in cmd.options] kwargs = {}
for x in cmd.options:
kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x))
cmd_runner = Commands(config, wallet, None) cmd_runner = Commands(config, wallet, None)
func = getattr(cmd_runner, cmd.name) func = getattr(cmd_runner, cmd.name)
result = func(*args) result = func(*args, **kwargs)
# save wallet # save wallet
if wallet: if wallet:
wallet.storage.write() wallet.storage.write()

View File

@ -259,10 +259,12 @@ class Daemon(DaemonThread):
# decode json arguments # decode json arguments
args = [json_decode(i) for i in args] args = [json_decode(i) for i in args]
# options # options
args += list(map(lambda x: (config_options.get(x) if x in ['password', 'new_password'] else config.get(x)), cmd.options)) kwargs = {}
for x in cmd.options:
kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x))
cmd_runner = Commands(config, wallet, self.network) cmd_runner = Commands(config, wallet, self.network)
func = getattr(cmd_runner, cmd.name) func = getattr(cmd_runner, cmd.name)
result = func(*args) result = func(*args, **kwargs)
return result return result
def run(self): def run(self):