BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename load_wallet command

This commit is contained in:
ThomasV 2017-03-05 20:25:42 +01:00
parent e83d2b8772
commit 76dd11783b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrum
View File

@ -379,7 +379,7 @@ if __name__ == '__main__':
elif cmdname == 'daemon': elif cmdname == 'daemon':
subcommand = config.get('subcommand') subcommand = config.get('subcommand')
if subcommand in ['open_wallet']: if subcommand in ['load_wallet']:
init_daemon(config_options) init_daemon(config_options)
if subcommand in [None, 'start']: if subcommand in [None, 'start']:

2
lib/commands.py
View File

@ -793,7 +793,7 @@ def get_parser():
add_global_options(parser_gui) add_global_options(parser_gui)
# daemon # daemon
parser_daemon = subparsers.add_parser('daemon', help="Run Daemon") parser_daemon = subparsers.add_parser('daemon', help="Run Daemon")
parser_daemon.add_argument("subcommand", choices=['start', 'status', 'stop', 'open_wallet', 'close_wallet'], nargs='?') parser_daemon.add_argument("subcommand", choices=['start', 'status', 'stop', 'load_wallet', 'close_wallet'], nargs='?')
#parser_daemon.set_defaults(func=run_daemon) #parser_daemon.set_defaults(func=run_daemon)
add_network_options(parser_daemon) add_network_options(parser_daemon)
add_global_options(parser_daemon) add_global_options(parser_daemon)

6
lib/daemon.py
View File

@ -147,10 +147,10 @@ class Daemon(DaemonThread):
def run_daemon(self, config_options): def run_daemon(self, config_options):
config = SimpleConfig(config_options) config = SimpleConfig(config_options)
sub = config.get('subcommand') sub = config.get('subcommand')
assert sub in [None, 'start', 'stop', 'status', 'open_wallet', 'close_wallet'] assert sub in [None, 'start', 'stop', 'status', 'load_wallet', 'close_wallet']
if sub in [None, 'start']: if sub in [None, 'start']:
response = "Daemon already running" response = "Daemon already running"
elif sub == 'open_wallet': elif sub == 'load_wallet':
path = config.get_wallet_path() path = config.get_wallet_path()
self.load_wallet(path, lambda: config.get('password')) self.load_wallet(path, lambda: config.get('password'))
response = True response = True
@ -245,7 +245,7 @@ class Daemon(DaemonThread):
path = config.get_wallet_path() path = config.get_wallet_path()
wallet = self.wallets.get(path) wallet = self.wallets.get(path)
if wallet is None: if wallet is None:
return {'error': 'Wallet not open. Use "electrum daemon open -w wallet"'} return {'error': 'Wallet not open. Use "electrum daemon load_wallet"'}
else: else:
wallet = None wallet = None
# arguments passed to function # arguments passed to function