AaronFiore/electrum
1
0
Fork 0
Code Activity

CLI: always use the daemon's cmd_runner, and pass the 'wallet'

Browse Source 
parameter explicitly to each command that requires it.
Previous code was relying on side effects to set the wallet.
This should fix #5614
This commit is contained in:
ThomasV
2019-09-05 17:57:51 +02:00
parent 0deb12cb2b
commit 9ec9e1760a
3 changed files with 154 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
run_electrum
View File

@@ -211,6 +211,7 @@ async def run_offline_command(config, config_options, plugins):
config_options['password'] = password
storage.decrypt(password)
wallet = Wallet(storage)
config_options['wallet'] = wallet
else:
wallet = None
# check password
@@ -230,8 +231,8 @@ 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 ['password', 'new_password'] else config.get(x))
cmd_runner = Commands(config, wallet, None)
kwargs[x] = (config_options.get(x) if x in ['wallet', 'password', 'new_password'] else config.get(x))
cmd_runner = Commands(config, None, None)
func = getattr(cmd_runner, cmd.name)
result = await func(*args, **kwargs)
# save wallet