diff --git a/freqtrade/data/dataprovider.py b/freqtrade/data/dataprovider.py index 9b9c73e55..c6f9c9c88 100644 --- a/freqtrade/data/dataprovider.py +++ b/freqtrade/data/dataprovider.py @@ -32,7 +32,7 @@ class DataProvider(object): @property def available_pairs(self) -> List[str]: """ - Return a list of pairs for which data is currently cached. + Return a list of tuples containing pair, tick_interval for which data is currently cached. Should be whitelist + open trades. """ return list(self._exchange._klines.keys()) diff --git a/freqtrade/exchange/__init__.py b/freqtrade/exchange/__init__.py index 21eab39d4..1fff1c1b5 100644 --- a/freqtrade/exchange/__init__.py +++ b/freqtrade/exchange/__init__.py @@ -579,7 +579,7 @@ class Exchange(object): """ try: # fetch ohlcv asynchronously - logger.debug("fetching %s since %s ...", pair, since_ms) + logger.debug("fetching %s, %s since %s ...", pair, tick_interval, since_ms) data = await self._api_async.fetch_ohlcv(pair, timeframe=tick_interval, since=since_ms) diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py index ca6190ae4..ef2815bed 100644 --- a/freqtrade/tests/test_freqtradebot.py +++ b/freqtrade/tests/test_freqtradebot.py @@ -43,7 +43,7 @@ def patch_get_signal(freqtrade: FreqtradeBot, value=(True, False)) -> None: :return: None """ freqtrade.strategy.get_signal = lambda e, s, t: value - freqtrade.exchange.refresh_latest_ohlcv = lambda p, i: None + freqtrade.exchange.refresh_latest_ohlcv = lambda p: None def patch_RPCManager(mocker) -> MagicMock: diff --git a/scripts/plot_dataframe.py b/scripts/plot_dataframe.py index 8f3e8327a..8c0793174 100755 --- a/scripts/plot_dataframe.py +++ b/scripts/plot_dataframe.py @@ -138,8 +138,8 @@ def plot_analyzed_dataframe(args: Namespace) -> None: tickers = {} if args.live: logger.info('Downloading pair.') - exchange.refresh_latest_ohlcv([pair], tick_interval) - tickers[pair] = exchange.klines(pair) + exchange.refresh_latest_ohlcv([(pair, tick_interval)]) + tickers[pair] = exchange.klines((pair, tick_interval)) else: tickers = history.load_data( datadir=Path(_CONF.get("datadir")),