adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fetching timeframe (failed in backtesting)

Browse Source
This commit is contained in:
hroff-1902 2020-05-16 11:59:47 +03:00
parent facaaabc1e
commit e7c11ed2cf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/data/dataprovider.py
View File

@ -25,7 +25,6 @@ class DataProvider:
self._config = config self._config = config
self._exchange = exchange self._exchange = exchange
self._pairlists = pairlists self._pairlists = pairlists
self._timeframe = self._config['ticker_interval']
def refresh(self, def refresh(self,
pairlist: ListPairsWithTimeframes, pairlist: ListPairsWithTimeframes,
@ -50,7 +49,7 @@ class DataProvider:
""" """
Create list of pair tuples with (pair, ticker_interval) Create list of pair tuples with (pair, ticker_interval)
""" """
return [(pair, timeframe or self._timeframe) for pair in pairs] return [(pair, timeframe or self._config['ticker_interval']) for pair in pairs]
def ohlcv(self, pair: str, timeframe: str = None, copy: bool = True) -> DataFrame: def ohlcv(self, pair: str, timeframe: str = None, copy: bool = True) -> DataFrame:
""" """
@ -62,7 +61,7 @@ class DataProvider:
Use False only for read-only operations (where the dataframe is not modified) Use False only for read-only operations (where the dataframe is not modified)
""" """
if self.runmode in (RunMode.DRY_RUN, RunMode.LIVE): if self.runmode in (RunMode.DRY_RUN, RunMode.LIVE):
return self._exchange.klines((pair, timeframe or self._timeframe), return self._exchange.klines((pair, timeframe or self._config['ticker_interval']),
copy=copy) copy=copy)
else: else:
return DataFrame() return DataFrame()
@ -74,7 +73,7 @@ class DataProvider:
:param timeframe: timeframe to get data for :param timeframe: timeframe to get data for
""" """
return load_pair_history(pair=pair, return load_pair_history(pair=pair,
timeframe=timeframe or self._timeframe, timeframe=timeframe or self._config['ticker_interval'],
datadir=self._config['datadir'] datadir=self._config['datadir']
) )