Merge branch 'develop' into StopLossSupport

freqtrade/fiat_convert.py

@@ -8,6 +8,7 @@ import time
 from typing import Dict
 
 from coinmarketcap import Market
+from requests.exceptions import RequestException
 
 logger = logging.getLogger(__name__)
 
@@ -94,8 +95,8 @@ class CryptoToFiatConverter(object):
             coinlistings = self._coinmarketcap.listings()
             self._cryptomap = dict(map(lambda coin: (coin["symbol"], str(coin["id"])),
                                        coinlistings["data"]))
-        except ValueError:
-            logger.error("Could not load FIAT Cryptocurrency map")
+        except (ValueError, RequestException) as e:
+            logger.error("Could not load FIAT Cryptocurrency map for the following problem: %s", e)
 
     def convert_amount(self, crypto_amount: float, crypto_symbol: str, fiat_symbol: str) -> float:
         """

freqtrade/main.py

@@ -61,6 +61,7 @@ def set_loggers() -> None:
     :return: None
     """
     logging.getLogger('requests.packages.urllib3').setLevel(logging.INFO)
+    logging.getLogger('ccxt.base.exchange').setLevel(logging.INFO)
     logging.getLogger('telegram').setLevel(logging.INFO)
 
 

freqtrade/optimize/__init__.py

@@ -29,7 +29,7 @@ def trim_tickerlist(tickerlist: List[Dict], timerange: Tuple[Tuple, int, int]) -
     if stype[0] == 'index':
         start_index = start
     elif stype[0] == 'date':
-        while tickerlist[start_index][0] < start * 1000:
+        while start_index < len(tickerlist) and tickerlist[start_index][0] < start * 1000:
             start_index += 1
 
     if stype[1] == 'line':
@@ -37,7 +37,7 @@ def trim_tickerlist(tickerlist: List[Dict], timerange: Tuple[Tuple, int, int]) -
     if stype[1] == 'index':
         stop_index = stop
     elif stype[1] == 'date':
-        while tickerlist[stop_index-1][0] > stop * 1000:
+        while stop_index > 0 and tickerlist[stop_index-1][0] > stop * 1000:
             stop_index -= 1
 
     if start_index > stop_index:
@@ -100,15 +100,11 @@ def load_data(datadir: str,
 
     for pair in _pairs:
         pairdata = load_tickerdata_file(datadir, pair, ticker_interval, timerange=timerange)
-        if not pairdata:
-            # download the tickerdata from exchange
-            download_backtesting_testdata(datadir,
-                                          pair=pair,
-                                          tick_interval=ticker_interval,
-                                          timerange=timerange)
-            # and retry reading the pair
-            pairdata = load_tickerdata_file(datadir, pair, ticker_interval, timerange=timerange)
-        result[pair] = pairdata
+        if pairdata:
+            result[pair] = pairdata
+        else:
+            logger.warn('No data for pair %s, use --update-pairs-cached to download the data', pair)
+
     return result
 
 

freqtrade/rpc/rpc.py

@@ -98,10 +98,11 @@ class RPC(object):
                     trade.id,
                     trade.pair,
                     shorten_date(arrow.get(trade.open_date).humanize(only_distance=True)),
-                    '{:.2f}%'.format(100 * trade.calc_profit_percent(current_rate))
+                    '{:.2f}%'.format(100 * trade.calc_profit_percent(current_rate)),
+                    '{:.6f}'.format(trade.amount * current_rate)
                 ])
 
-            columns = ['ID', 'Pair', 'Since', 'Profit']
+            columns = ['ID', 'Pair', 'Since', 'Profit', 'Value']
             df_statuses = DataFrame.from_records(trades_list, columns=columns)
             df_statuses = df_statuses.set_index(columns[0])
             # The style used throughout is to return a tuple

freqtrade/tests/optimize/test_optimize.py

@@ -99,7 +99,20 @@ def test_load_data_with_new_pair_1min(ticker_history, mocker, caplog) -> None:
     file = os.path.join(os.path.dirname(__file__), '..', 'testdata', 'MEME_BTC-1m.json')
 
     _backup_file(file)
-    optimize.load_data(None, ticker_interval='1m', pairs=['MEME/BTC'])
+    # do not download a new pair if refresh_pairs isn't set
+    optimize.load_data(None,
+                       ticker_interval='1m',
+                       refresh_pairs=False,
+                       pairs=['MEME/BTC'])
+    assert os.path.isfile(file) is False
+    assert log_has('No data for pair MEME/BTC, use --update-pairs-cached to download the data',
+                   caplog.record_tuples)
+
+    # download a new pair if refresh_pairs is set
+    optimize.load_data(None,
+                       ticker_interval='1m',
+                       refresh_pairs=True,
+                       pairs=['MEME/BTC'])
     assert os.path.isfile(file) is True
     assert log_has('Download the pair: "MEME/BTC", Interval: 1m', caplog.record_tuples)
     _clean_test_file(file)

freqtrade/tests/rpc/test_rpc.py

@@ -106,6 +106,7 @@ def test_rpc_status_table(default_conf, ticker, fee, mocker) -> None:
     assert 'just now' in result['Since'].all()
     assert 'ETH/BTC' in result['Pair'].all()
     assert '-0.59%' in result['Profit'].all()
+    assert 'Value' in result
 
 
 def test_rpc_daily_profit(default_conf, update, ticker, fee,

freqtrade/tests/test_fiat_convert.py

@@ -6,6 +6,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
+from requests.exceptions import RequestException
+
 from freqtrade.fiat_convert import CryptoFiat, CryptoToFiatConverter
 from freqtrade.tests.conftest import patch_coinmarketcap
 
@@ -133,6 +135,21 @@ def test_loadcryptomap(mocker):
     assert fiat_convert._cryptomap["BTC"] == "1"
 
 
+def test_fiat_init_network_exception(mocker):
+    # Because CryptoToFiatConverter is a Singleton we reset the listings
+    listmock = MagicMock(side_effect=RequestException)
+    mocker.patch.multiple(
+        'freqtrade.fiat_convert.Market',
+        listings=listmock,
+    )
+    # with pytest.raises(RequestEsxception):
+    fiat_convert = CryptoToFiatConverter()
+    fiat_convert._cryptomap = {}
+    fiat_convert._load_cryptomap()
+
+    assert len(fiat_convert._cryptomap) == 0
+
+
 def test_fiat_convert_without_network():
     # Because CryptoToFiatConverter is a Singleton we reset the value of _coinmarketcap