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

10
electrum/daemon.py
View File

@@ -339,7 +339,7 @@ class Daemon(Logger):
self.methods = jsonrpcserver.methods.Methods()
self.methods.add(self.ping)
self.methods.add(self.gui)
self.cmd_runner = Commands(self.config, None, self.network, self)
self.cmd_runner = Commands(self.config, self.network, self)
for cmdname in known_commands:
self.methods.add(getattr(self.cmd_runner, cmdname))
self.methods.add(self.run_cmdline)
@@ -435,8 +435,7 @@ class Daemon(Logger):
wallet = self.wallets.get(path)
if wallet is None:
return {'error': 'Wallet "%s" is not loaded. Use "electrum load_wallet"'%os.path.basename(path) }
else:
wallet = None
config_options['wallet'] = wallet
# arguments passed to function
args = map(lambda x: config.get(x), cmd.params)
# decode json arguments
@@ -444,9 +443,8 @@ class Daemon(Logger):
# 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, self)
func = getattr(cmd_runner, cmd.name)
kwargs[x] = (config_options.get(x) if x in ['wallet', 'password', 'new_password'] else config.get(x))
func = getattr(self.cmd_runner, cmd.name)
try:
result = await func(*args, **kwargs)
except TypeError as e: