AaronFiore/electrum
1
0
Fork 0
Code Activity

Fix CLI. Some commands require wallet_path. Return error on exception.

Browse Source
This commit is contained in:
ThomasV
2019-09-06 11:06:08 +02:00
parent 5faa0ade3d
commit 35b0b3a43c
3 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
run_electrum
View File

@@ -203,6 +203,8 @@ async def run_offline_command(config, config_options, plugins):
cmdname = config.get('cmd')
cmd = known_commands[cmdname]
password = config_options.get('password')
if 'wallet_path' in cmd.options and config_options.get('wallet_path') is None:
config_options['wallet_path'] = config.get_wallet_path()
if cmd.requires_wallet:
storage = WalletStorage(config.get_wallet_path())
if storage.is_encrypted():
@@ -231,7 +233,7 @@ async def run_offline_command(config, config_options, plugins):
# options
kwargs = {}
for x in cmd.options:
kwargs[x] = (config_options.get(x) if x in ['wallet', 'password', 'new_password'] else config.get(x))
kwargs[x] = (config_options.get(x) if x in ['wallet_path', 'wallet', 'password', 'new_password'] else config.get(x))
cmd_runner = Commands(config=config)
func = getattr(cmd_runner, cmd.name)
result = await func(*args, **kwargs)