AaronFiore/electrum
1
0
Fork 0
Code Activity

add wallet_path to kwargs in run_cmdline

Browse Source
This commit is contained in:
ThomasV
2019-09-09 09:58:16 +02:00
parent 46ffab0b55
commit 103a37b0ca
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/commands.py
View File

@@ -105,6 +105,7 @@ def command(s):
kwargs['wallet_path'] = daemon.config.get_wallet_path() kwargs['wallet_path'] = daemon.config.get_wallet_path()
if cmd.requires_wallet: if cmd.requires_wallet:
wallet_path = kwargs.pop('wallet_path') wallet_path = kwargs.pop('wallet_path')
wallet_path = standardize_path(wallet_path)
wallet = daemon.wallets.get(wallet_path) wallet = daemon.wallets.get(wallet_path)
if wallet is None: if wallet is None:
raise Exception('wallet not loaded') raise Exception('wallet not loaded')

2
electrum/daemon.py
View File

@@ -443,6 +443,8 @@ class Daemon(Logger):
kwargs = {} kwargs = {}
for x in cmd.options: for x in cmd.options:
kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x)) kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x))
if cmd.requires_wallet:
kwargs['wallet_path'] = config_options.get('wallet_path')
func = getattr(self.cmd_runner, cmd.name) func = getattr(self.cmd_runner, cmd.name)
# fixme: not sure how to retrieve message in jsonrpcclient # fixme: not sure how to retrieve message in jsonrpcclient
try: try: