rename open close commands

electrum

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

lib/commands.py

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

lib/daemon.py

@@ -147,18 +147,17 @@ class Daemon(DaemonThread):
     def run_daemon(self, config_options):
         config = SimpleConfig(config_options)
         sub = config.get('subcommand')
-        assert sub in [None, 'start', 'stop', 'status', 'open', 'close']
+        assert sub in [None, 'start', 'stop', 'status', 'open_wallet', 'close_wallet']
         if sub in [None, 'start']:
             response = "Daemon already running"
-        elif sub == 'open':
+        elif sub == 'open_wallet':
             path = config.get_wallet_path()
             self.load_wallet(path, lambda: config.get('password'))
             response = True
-        elif sub == 'close':
+        elif sub == 'close_wallet':
             path = config.get_wallet_path()
             if path in self.wallets:
-                wallet = self.wallets.pop(path)
-                wallet.stop_threads()
+                self.stop_wallet(path)
                 response = True
             else:
                 response = False