From 5161e1abb3fd2fa5d5ea69751447d14cd3c58007 Mon Sep 17 00:00:00 2001
From: hroff-1902 <hroff_raeyd9tzpttf@mail.ru>
Date: Tue, 26 Mar 2019 11:07:02 +0300
Subject: [PATCH] Allow to pass config into worker, as it's used in the tests

---
 freqtrade/freqtradebot.py |  8 ++++++--
 freqtrade/worker.py       | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 94c1bca8a..7c92ac29a 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -34,7 +34,7 @@ class FreqtradeBot(object):
     This is from here the bot start its logic.
     """
 
-    def __init__(self, config: Dict[str, Any], worker: Worker) -> None:
+    def __init__(self, config: Dict[str, Any], worker: Optional[Worker] = None) -> None:
         """
         Init all variables and objects the bot needs to work
         :param config: configuration dict, you can use Configuration.get_config()
@@ -45,7 +45,7 @@ class FreqtradeBot(object):
 
         # Init objects
         self.config = config
-        self._worker: Worker = worker
+        self._worker = worker
 
         self.strategy: IStrategy = StrategyResolver(self.config).strategy
 
@@ -75,10 +75,14 @@ class FreqtradeBot(object):
 
     @property
     def state(self) -> State:
+        if self._worker is None:
+            raise DependencyException("No Worker is available")
         return self._worker.state
 
     @state.setter
     def state(self, value: State):
+        if self._worker is None:
+            raise DependencyException("No Worker is available")
         self._worker.state = value
 
     def cleanup(self) -> None:
diff --git a/freqtrade/worker.py b/freqtrade/worker.py
index 9a7e67424..a6fba1460 100755
--- a/freqtrade/worker.py
+++ b/freqtrade/worker.py
@@ -5,7 +5,7 @@ import logging
 import time
 import traceback
 from argparse import Namespace
-from typing import Any, Callable
+from typing import Any, Callable, Optional
 import sdnotify
 
 from freqtrade import (constants, OperationalException, TemporaryError,
@@ -23,26 +23,28 @@ class Worker(object):
     Freqtradebot worker class
     """
 
-    def __init__(self, args: Namespace) -> None:
+    def __init__(self, args: Optional[Namespace] = None, config = None) -> None:
         """
         Init all variables and objects the bot needs to work
         """
         logger.info('Starting worker %s', __version__)
 
         self._args = args
-        self._init()
+        self._config = config
+        self._init(False)
 
         # Tell systemd that we completed initialization phase
         if self._sd_notify:
             logger.debug("sd_notify: READY=1")
             self._sd_notify.notify("READY=1")
 
-    def _init(self):
+    def _init(self, reconfig: bool):
         """
-        Also called from the _reconfigure() method.
+        Also called from the _reconfigure() method (with reconfig=True).
         """
-        # Load configuration
-        self._config = Configuration(self._args, None).get_config()
+        if reconfig or self._config is None:
+            # Load configuration
+            self._config = Configuration(self._args, None).get_config()
 
         # Import freqtradebot here in order to avoid python circular
         # dependency error, damn!
@@ -77,17 +79,19 @@ class Worker(object):
     def run(self):
         state = None
         while True:
-            state = self._worker(old_state=state, throttle_secs=self._throttle_secs)
+            state = self._worker(old_state=state)
             if state == State.RELOAD_CONF:
                 self.freqtrade = self._reconfigure()
 
-    def _worker(self, old_state: State, throttle_secs: float) -> State:
+    def _worker(self, old_state: State, throttle_secs: Optional[float] = None) -> State:
         """
         Trading routine that must be run at each loop
         :param old_state: the previous service state from the previous call
         :return: current service state
         """
         state = self._state
+        if throttle_secs is None:
+            throttle_secs = self._throttle_secs
 
         # Log state transition
         if state != old_state:
@@ -166,7 +170,7 @@ class Worker(object):
         self.freqtrade.cleanup()
 
         # Load and validate config and create new instance of the bot
-        self._init()
+        self._init(True)
 
         self.freqtrade.rpc.send_msg({
             'type': RPCMessageType.STATUS_NOTIFICATION,