switch default to websockets impl

darkwallet-daemon.py

@@ -9,10 +9,10 @@ def main():
     settings.load()
 
     # Start the darkwallet-daemon
-    if settings.use_ws_impl:
-        darkwallet.start_ws(settings)
-    else:
+    if settings.use_tornado_impl:
         darkwallet.start(settings)
+    else:
+        darkwallet.start_ws(settings)
     return 0
 
 if __name__ == "__main__":

darkwallet/settings.py

@@ -24,13 +24,13 @@ def _parse(self):
         parser.add_argument("--port", "-p", dest="port",
                             help="Run on the given port.",
                             default=None)
-        parser.add_argument("--ws", "-w", dest="use_ws_impl",
+        parser.add_argument("--tornado", "-t", dest="use_tornado",
                             action="store_const", const=True, default=False,
-                            help="Use the websocket implementation instead.")
+                            help="Use the Tornado implementation instead.")
         return parser.parse_args()
 
     def _load(self, args):
-        self.use_ws_impl = args.use_ws_impl
+        self.use_tornado_impl = args.use_tornado
 
         self.config_path = args.config
         darkwallet.util.make_sure_dir_exists(self.config_path)

darkwallet/wallet.py

@@ -582,10 +582,11 @@ def _connect(self):
         url = self._settings.url
         if self._model.is_testnet:
             url = self._settings.testnet_url
-        if self._settings.use_ws_impl:
-            self.client = Client(self._context, url, client_settings)
-        else:
+        # Tornado implementation.
+        if self._settings.use_tornado_impl:
             self.client = FakeAsyncClient(self._context, url, client_settings)
+        else:
+            self.client = Client(self._context, url, client_settings)
         print("Connected to %s" % url)
 
     async def _check_updates(self):