merged remote

2018-06-01 19:32:36 -07:00
parent c665ed9ef3 52386d8153
commit 059a27cd24
96 changed files with 3334 additions and 2176 deletions
--- a/user_data/hyperopt_conf.py
+++ b/user_data/hyperopt_conf.py
@@ -25,17 +25,18 @@ def hyperopt_optimize_conf() -> dict:
            "ask_last_balance": 0.0
        },
        "exchange": {
+            "name": "bittrex",
            "pair_whitelist": [
-                "BTC_ETH",
-                "BTC_LTC",
-                "BTC_ETC",
-                "BTC_DASH",
-                "BTC_ZEC",
-                "BTC_XLM",
-                "BTC_NXT",
-                "BTC_POWR",
-                "BTC_ADA",
-                "BTC_XMR"
+                "ETH/BTC",
+                "LTC/BTC",
+                "ETC/BTC",
+                "DASH/BTC",
+                "ZEC/BTC",
+                "XLM/BTC",
+                "NXT/BTC",
+                "POWR/BTC",
+                "ADA/BTC",
+                "XMR/BTC"
            ]
        }
    }
--- a/user_data/strategies/test_strategy.py
+++ b/user_data/strategies/test_strategy.py
@@ -41,7 +41,7 @@ class TestStrategy(IStrategy):
    stoploss = -0.10

    # Optimal ticker interval for the strategy
-    ticker_interval = 5
+    ticker_interval = '5m'

    def populate_indicators(self, dataframe: DataFrame) -> DataFrame:
        """