async branch updated to reflect develop branch changes

2018-08-02 16:48:21 +02:00
parent 7dc440b874 ea72af7ce4
commit 2ec2f1abce
25 changed files with 543 additions and 113 deletions
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -510,7 +510,6 @@ class FreqtradeBot(object):
        (buy, sell) = (False, False)
        experimental = self.config.get('experimental', {})
        if experimental.get('use_sell_signal') or experimental.get('ignore_roi_if_buy_signal'):
-            # ticker = self.exchange.get_ticker_history(trade.pair, self.strategy.ticker_interval)
            ticker = self._klines.get(trade.pair)
            (buy, sell) = self.strategy.get_signal(trade.pair, self.strategy.ticker_interval,
                                                   ticker)