Pass format to load_data

freqtrade · Dec 28, 2019 · f4a532e · f4a532e
1 parent 6b59833
commit f4a532e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/freqtrade/data/history/history_utils.py b/freqtrade/data/history/history_utils.py
@@ -72,7 +72,7 @@ def load_data(datadir: Path,
     :param fill_up_missing: Fill missing values with "No action"-candles
     :param startup_candles: Additional candles to load at the start of the period
     :param fail_without_data: Raise OperationalException if no data is found.
-    :param data_handler: Initialized data-handler to use.
+    :param data_format: Data format which should be used. Defaults to json
     :return: dict(<pair>:<Dataframe>)
     """
     result: Dict[str, DataFrame] = {}

diff --git a/freqtrade/edge/__init__.py b/freqtrade/edge/__init__.py
@@ -108,6 +108,7 @@ def calculate(self) -> bool:
             timeframe=self.strategy.ticker_interval,
             timerange=self._timerange,
             startup_candles=self.strategy.startup_candle_count,
+            data_format=self.config.get('dataformat_ohlcv', 'json'),
         )
 
         if not data:

diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py
@@ -116,6 +116,7 @@ def load_bt_data(self):
             timerange=timerange,
             startup_candles=self.required_startup,
             fail_without_data=True,
+            data_format=self.config.get('dataformat_ohlcv', 'json'),
         )
 
         min_date, max_date = history.get_timerange(data)

diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py
@@ -42,6 +42,7 @@ def init_plotscript(config):
         pairs=pairs,
         timeframe=config.get('ticker_interval', '5m'),
         timerange=timerange,
+        data_format=config.get('dataformat_ohlcv', 'json'),
     )
 
     trades = load_trades(config['trade_source'],