AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #2861: error message when password is missing

Browse Source
This commit is contained in:
ThomasV
2017-10-07 08:19:14 +02:00
parent 252cb491c8
commit 6dd2b8b471
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/commands.py
View File

@@ -84,8 +84,12 @@ def command(s):
@wraps(func) @wraps(func)
def func_wrapper(*args, **kwargs): def func_wrapper(*args, **kwargs):
c = known_commands[func.__name__] c = known_commands[func.__name__]
if c.requires_wallet and args[0].wallet is None: wallet = args[0].wallet
password = kwargs.get('password')
if c.requires_wallet and wallet is None:
raise BaseException("wallet not loaded. Use 'electrum daemon load_wallet'") raise BaseException("wallet not loaded. Use 'electrum daemon load_wallet'")
if c.requires_password and password is None and wallet.storage.get('use_encryption'):
return {'error': 'Password required' }
return func(*args, **kwargs) return func(*args, **kwargs)
return func_wrapper return func_wrapper
return decorator return decorator