Merge branch 'develop' into keep_dataframe_noapi

tests/data/test_dataprovider.py

@@ -5,7 +5,7 @@ import pytest
 from pandas import DataFrame
 
 from freqtrade.data.dataprovider import DataProvider
-from freqtrade.exceptions import DependencyException, OperationalException
+from freqtrade.exceptions import ExchangeError, OperationalException
 from freqtrade.pairlist.pairlistmanager import PairListManager
 from freqtrade.state import RunMode
 from tests.conftest import get_patched_exchange
@@ -165,7 +165,7 @@ def test_ticker(mocker, default_conf, tickers):
     assert 'symbol' in res
     assert res['symbol'] == 'ETH/BTC'
 
-    ticker_mock = MagicMock(side_effect=DependencyException('Pair not found'))
+    ticker_mock = MagicMock(side_effect=ExchangeError('Pair not found'))
     mocker.patch("freqtrade.exchange.Exchange.fetch_ticker", ticker_mock)
     exchange = get_patched_exchange(mocker, default_conf)
     dp = DataProvider(default_conf, exchange)

tests/data/test_history.py

@@ -557,6 +557,7 @@ def test_download_trades_history(trades_history, mocker, default_conf, testdatad
     assert ght_mock.call_count == 1
     # Check this in seconds - since we had to convert to seconds above too.
     assert int(ght_mock.call_args_list[0][1]['since'] // 1000) == since_time2 - 5
+    assert ght_mock.call_args_list[0][1]['from_id'] is not None
 
     # clean files freshly downloaded
     _clean_test_file(file1)
@@ -568,6 +569,27 @@ def test_download_trades_history(trades_history, mocker, default_conf, testdatad
                                         pair='ETH/BTC')
     assert log_has_re('Failed to download historic trades for pair: "ETH/BTC".*', caplog)
 
+    file2 = testdatadir / 'XRP_ETH-trades.json.gz'
+
+    _backup_file(file2, True)
+
+    ght_mock.reset_mock()
+    mocker.patch('freqtrade.exchange.Exchange.get_historic_trades',
+                 ght_mock)
+    # Since before first start date
+    since_time = int(trades_history[0][0] // 1000) - 500
+    timerange = TimeRange('date', None, since_time, 0)
+
+    assert _download_trades_history(data_handler=data_handler, exchange=exchange,
+                                    pair='XRP/ETH', timerange=timerange)
+
+    assert ght_mock.call_count == 1
+
+    assert int(ght_mock.call_args_list[0][1]['since'] // 1000) == since_time
+    assert ght_mock.call_args_list[0][1]['from_id'] is None
+    assert log_has_re(r'Start earlier than available data. Redownloading trades for.*', caplog)
+    _clean_test_file(file2)
+
 
 def test_convert_trades_to_ohlcv(mocker, default_conf, testdatadir, caplog):