Merge branch 'develop' into timeframe

2020-06-15 06:35:55 +02:00
parent d337fb6c6a f80b5f9410
commit a3506f4d8e
47 changed files with 893 additions and 367 deletions
--- a/tests/data/test_btanalysis.py
+++ b/tests/data/test_btanalysis.py
@@ -47,7 +47,7 @@ def test_load_trades_from_db(default_conf, fee, mocker):
    assert isinstance(trades, DataFrame)
    assert "pair" in trades.columns
    assert "open_time" in trades.columns
-    assert "profitperc" in trades.columns
+    assert "profit_percent" in trades.columns

    for col in BT_DATA_COLUMNS:
        if col not in ['index', 'open_at_end']: