Adjust tests and remove legacy variable

freqtrade/freqtradebot.py

@@ -332,7 +332,6 @@ class FreqtradeBot(object):
             th[_pair] = self.exchange.get_ticker_history(_pair, interval)
 
         # Pick pair based on buy signals
-        bought_at_least_one = False
         for _pair in whitelist:
             (buy, sell) = self.strategy.get_signal(_pair, interval, th[_pair])
 

freqtrade/tests/strategy/test_interface.py

@@ -20,74 +20,62 @@ _STRATEGY = DefaultStrategy(config={})
 
 
 def test_returns_latest_buy_signal(mocker, default_conf):
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker_history', return_value=MagicMock())
-    exchange = get_patched_exchange(mocker, default_conf)
     mocker.patch.object(
         _STRATEGY, 'analyze_ticker',
         return_value=DataFrame([{'buy': 1, 'sell': 0, 'date': arrow.utcnow()}])
     )
-    assert _STRATEGY.get_signal(exchange, 'ETH/BTC', '5m') == (True, False)
+    assert _STRATEGY.get_signal('ETH/BTC', '5m', MagicMock()) == (True, False)
 
     mocker.patch.object(
         _STRATEGY, 'analyze_ticker',
         return_value=DataFrame([{'buy': 0, 'sell': 1, 'date': arrow.utcnow()}])
     )
-    assert _STRATEGY.get_signal(exchange, 'ETH/BTC', '5m') == (False, True)
+    assert _STRATEGY.get_signal('ETH/BTC', '5m', MagicMock()) == (False, True)
 
 
 def test_returns_latest_sell_signal(mocker, default_conf):
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker_history', return_value=MagicMock())
-    exchange = get_patched_exchange(mocker, default_conf)
     mocker.patch.object(
         _STRATEGY, 'analyze_ticker',
         return_value=DataFrame([{'sell': 1, 'buy': 0, 'date': arrow.utcnow()}])
     )
 
-    assert _STRATEGY.get_signal(exchange, 'ETH/BTC', '5m') == (False, True)
+    assert _STRATEGY.get_signal('ETH/BTC', '5m', MagicMock()) == (False, True)
 
     mocker.patch.object(
         _STRATEGY, 'analyze_ticker',
         return_value=DataFrame([{'sell': 0, 'buy': 1, 'date': arrow.utcnow()}])
     )
-    assert _STRATEGY.get_signal(exchange, 'ETH/BTC', '5m') == (True, False)
+    assert _STRATEGY.get_signal('ETH/BTC', '5m', MagicMock()) == (True, False)
 
 
 def test_get_signal_empty(default_conf, mocker, caplog):
-    caplog.set_level(logging.INFO)
+    assert (False, False) == _STRATEGY.get_signal('foo', default_conf['ticker_interval'],
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker_history', return_value=None)
+                                                  None)
-    exchange = get_patched_exchange(mocker, default_conf)
-    assert (False, False) == _STRATEGY.get_signal(exchange, 'foo', default_conf['ticker_interval'])
     assert log_has('Empty ticker history for pair foo', caplog.record_tuples)
 
 
 def test_get_signal_exception_valueerror(default_conf, mocker, caplog):
     caplog.set_level(logging.INFO)
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker_history', return_value=1)
-    exchange = get_patched_exchange(mocker, default_conf)
     mocker.patch.object(
         _STRATEGY, 'analyze_ticker',
         side_effect=ValueError('xyz')
     )
-    assert (False, False) == _STRATEGY.get_signal(exchange, 'foo', default_conf['ticker_interval'])
+    assert (False, False) == _STRATEGY.get_signal('foo', default_conf['ticker_interval'], 1)
     assert log_has('Unable to analyze ticker for pair foo: xyz', caplog.record_tuples)
 
 
 def test_get_signal_empty_dataframe(default_conf, mocker, caplog):
     caplog.set_level(logging.INFO)
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker_history', return_value=1)
-    exchange = get_patched_exchange(mocker, default_conf)
     mocker.patch.object(
         _STRATEGY, 'analyze_ticker',
         return_value=DataFrame([])
     )
-    assert (False, False) == _STRATEGY.get_signal(exchange, 'xyz', default_conf['ticker_interval'])
+    assert (False, False) == _STRATEGY.get_signal('xyz', default_conf['ticker_interval'], 1)
     assert log_has('Empty dataframe for pair xyz', caplog.record_tuples)
 
 
 def test_get_signal_old_dataframe(default_conf, mocker, caplog):
     caplog.set_level(logging.INFO)
-    mocker.patch('freqtrade.exchange.Exchange.get_ticker_history', return_value=1)
-    exchange = get_patched_exchange(mocker, default_conf)
     # default_conf defines a 5m interval. we check interval * 2 + 5m
     # this is necessary as the last candle is removed (partial candles) by default
     oldtime = arrow.utcnow().shift(minutes=-16)
@@ -96,7 +84,7 @@ def test_get_signal_old_dataframe(default_conf, mocker, caplog):
         _STRATEGY, 'analyze_ticker',
         return_value=DataFrame(ticks)
     )
-    assert (False, False) == _STRATEGY.get_signal(exchange, 'xyz', default_conf['ticker_interval'])
+    assert (False, False) == _STRATEGY.get_signal('xyz', default_conf['ticker_interval'], 1)
     assert log_has(
         'Outdated history for pair xyz. Last tick is 16 minutes old',
         caplog.record_tuples