From df3e76a65df49448315786f23af73d637a76889d Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 26 Jul 2018 19:11:29 +0100 Subject: [PATCH] Remove legacy code, fix missed call --- freqtrade/freqtradebot.py | 11 ++++++----- freqtrade/strategy/interface.py | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 3317a7b68..d7c5657c3 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -327,13 +327,13 @@ class FreqtradeBot(object): if not whitelist: raise DependencyException('No currency pairs in whitelist') - th = {} + thistory = {} for _pair in whitelist: - th[_pair] = self.exchange.get_ticker_history(_pair, interval) + thistory[_pair] = self.exchange.get_ticker_history(_pair, interval) # Pick pair based on buy signals for _pair in whitelist: - (buy, sell) = self.strategy.get_signal(_pair, interval, th[_pair]) + (buy, sell) = self.strategy.get_signal(_pair, interval, thistory[_pair]) if buy and not sell: return self.execute_buy(_pair, stake_amount) @@ -499,8 +499,9 @@ 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'): - (buy, sell) = self.strategy.get_signal(self.exchange, - trade.pair, self.strategy.ticker_interval) + ticker = self.exchange.get_ticker_history(trade.pair, self.strategy.ticker_interval) + (buy, sell) = self.strategy.get_signal(trade.pair, self.strategy.ticker_interval, + ticker) should_sell = self.strategy.should_sell(trade, current_rate, datetime.utcnow(), buy, sell) if should_sell.sell_flag: diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 23b0563a2..a5145aabb 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -13,7 +13,6 @@ from pandas import DataFrame from freqtrade import constants from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe -from freqtrade.exchange import Exchange from freqtrade.persistence import Trade logger = logging.getLogger(__name__)