Merge branch 'worker-enable-error'

dexbot/__init__.py

@@ -1,4 +1,4 @@
 APP_NAME = 'dexbot'
-VERSION = '0.4.7'
+VERSION = '0.4.8'
 AUTHOR = 'Codaone Oy'
 __version__ = VERSION

dexbot/basestrategy.py

@@ -496,8 +496,8 @@ def calculate_order_data(self, order, amount, price):
     def purge(self):
         """ Clear all the worker data from the database and cancel all orders
         """
-        self.cancel_all()
         self.clear_orders()
+        self.cancel_all()
         self.clear()
 
     @staticmethod

dexbot/cli.py

@@ -108,6 +108,9 @@ def run(ctx):
 
 @main.command()
 @click.pass_context
+@configfile
+@chain
+@unlock
 def configure(ctx):
     """ Interactively configure dexbot
     """
@@ -117,7 +120,7 @@ def configure(ctx):
         os.system('systemctl --user stop dexbot')
 
     config = Config(path=ctx.obj['configfile'])
-    configure_dexbot(config)
+    configure_dexbot(config, ctx)
     config.save_config()
 
     click.echo("New configuration saved")

dexbot/cli_conf.py

@@ -179,7 +179,7 @@ def configure_worker(d, worker):
     return worker
 
 
-def configure_dexbot(config):
+def configure_dexbot(config, ctx):
     d = get_whiptail()
     workers = config.get('workers', {})
     if not workers:
@@ -190,21 +190,23 @@ def configure_dexbot(config):
                 break
         setup_systemd(d, config)
     else:
+        bitshares_instance = ctx.bitshares
         action = d.menu("You have an existing configuration.\nSelect an action:",
                         [('NEW', 'Create a new worker'),
                          ('DEL', 'Delete a worker'),
                          ('EDIT', 'Edit a worker'),
                          ('CONF', 'Redo general config')])
+
         if action == 'EDIT':
             worker_name = d.menu("Select worker to edit", [(i, i) for i in workers])
             config['workers'][worker_name] = configure_worker(d, config['workers'][worker_name])
-            bitshares_instance = BitShares(config['node'])
+
             strategy = BaseStrategy(worker_name, bitshares_instance=bitshares_instance)
             strategy.purge()
         elif action == 'DEL':
             worker_name = d.menu("Select worker to delete", [(i, i) for i in workers])
             del config['workers'][worker_name]
-            bitshares_instance = BitShares(config['node'])
+
             strategy = BaseStrategy(worker_name, bitshares_instance=bitshares_instance)
             strategy.purge()
         elif action == 'NEW':

dexbot/controllers/main_controller.py

@@ -63,14 +63,13 @@ def remove_worker(self, worker_name):
             else:
                 # Worker not running
                 config = self.config.get_worker_config(worker_name)
-                WorkerInfrastructure.remove_offline_worker(config, worker_name)
+                WorkerInfrastructure.remove_offline_worker(config, worker_name, self.bitshares_instance)
         else:
             # Worker manager not running
             config = self.config.get_worker_config(worker_name)
-            WorkerInfrastructure.remove_offline_worker(config, worker_name)
+            WorkerInfrastructure.remove_offline_worker(config, worker_name, self.bitshares_instance)
 
     @staticmethod
     def create_worker(worker_name):
         # Deletes old worker's data
         WorkerInfrastructure.remove_offline_worker_data(worker_name)
-

dexbot/views/worker_item.py

@@ -3,11 +3,9 @@
 from .ui.worker_item_widget_ui import Ui_widget
 from .confirmation import ConfirmationDialog
 from .edit_worker import EditWorkerView
-from .errors import gui_error
 from dexbot.storage import db_worker
 from dexbot.controllers.worker_controller import WorkerController
 from dexbot.views.errors import gui_error
-from dexbot.resources import icons_rc
 
 from PyQt5 import QtCore, QtWidgets
 
@@ -141,7 +139,10 @@ def remove_widget_dialog(self):
             self.remove_widget()
 
     def remove_widget(self):
+        account = self.worker_config['workers'][self.worker_name]['account']
+
         self.main_ctrl.remove_worker(self.worker_name)
+        self.main_ctrl.bitshares_instance.wallet.removeAccount(account)
         self.view.remove_worker_widget(self.worker_name)
         self.main_ctrl.config.remove_worker_config(self.worker_name)
         self.deleteLater()

dexbot/worker.py

@@ -223,9 +223,8 @@ def remove_market(self, worker_name):
                 self.markets.remove(market)
 
     @staticmethod
-    def remove_offline_worker(config, worker_name):
+    def remove_offline_worker(config, worker_name, bitshares_instance):
         # Initialize the base strategy to get control over the data
-        bitshares_instance = BitShares(config['node'])
         strategy = BaseStrategy(worker_name, config, bitshares_instance=bitshares_instance)
         strategy.purge()