AaronFiore/electrum
1
0
Fork 0
Code Activity

commands/jsonrpc: fix specifying "wallet" to commands that need it

Browse Source
This commit is contained in:
SomberNight
2019-12-21 07:00:30 +01:00
parent 2ca535225d
commit ad5c6284c4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/commands.py
View File

@@ -106,7 +106,8 @@ def command(s):
daemon = cmd_runner.daemon daemon = cmd_runner.daemon
if daemon: if daemon:
if (cmd.requires_wallet or 'wallet_path' in cmd.options) and kwargs.get('wallet_path') is None: if (cmd.requires_wallet or 'wallet_path' in cmd.options) and kwargs.get('wallet_path') is None:
kwargs['wallet_path'] = daemon.config.get_wallet_path() # using JSON-RPC, sometimes the "wallet" kwarg needs to be used to specify a wallet
kwargs['wallet_path'] = kwargs.pop('wallet', None) or 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 = daemon.get_wallet(wallet_path) wallet = daemon.get_wallet(wallet_path)