Merge pull request #3320 from freqtrade/fix_sell_spamming

Fix sell spamming

tests/rpc/test_rpc.py

@@ -60,6 +60,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'open_trade_price': ANY,
         'close_rate_requested': ANY,
         'sell_reason': ANY,
+        'sell_order_status': ANY,
         'min_rate': ANY,
         'max_rate': ANY,
         'strategy': ANY,
@@ -103,6 +104,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'open_trade_price': ANY,
         'close_rate_requested': ANY,
         'sell_reason': ANY,
+        'sell_order_status': ANY,
         'min_rate': ANY,
         'max_rate': ANY,
         'strategy': ANY,

tests/rpc/test_rpc_apiserver.py

@@ -520,6 +520,7 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
                         'open_rate_requested': 1.098e-05,
                         'open_trade_price': 0.0010025,
                         'sell_reason': None,
+                        'sell_order_status': None,
                         'strategy': 'DefaultStrategy',
                         'ticker_interval': 5}]
 
@@ -626,6 +627,7 @@ def test_api_forcebuy(botclient, mocker, fee):
                        'open_rate_requested': None,
                        'open_trade_price': 0.2460546025,
                        'sell_reason': None,
+                       'sell_order_status': None,
                        'strategy': None,
                        'ticker_interval': None
                        }

tests/rpc/test_rpc_telegram.py

@@ -170,6 +170,7 @@ def test_status(default_conf, update, mocker, fee, ticker,) -> None:
             'current_profit': -0.59,
             'initial_stop_loss': 1.098e-05,
             'stop_loss': 1.099e-05,
+            'sell_order_status': None,
             'initial_stop_loss_pct': -0.05,
             'stop_loss_pct': -0.01,
             'open_order': '(limit buy rem=0.00000000)'

tests/test_freqtradebot.py

@@ -1976,6 +1976,10 @@ def test_check_handle_timedout_buy_usercustom(default_conf, ticker, limit_buy_or
 
     Trade.session.add(open_trade)
 
+    # Ensure default is to return empty (so not mocked yet)
+    freqtrade.check_handle_timedout()
+    assert cancel_order_mock.call_count == 0
+
     # Return false - trade remains open
     freqtrade.strategy.check_buy_timeout = MagicMock(return_value=False)
     freqtrade.check_handle_timedout()
@@ -2106,6 +2110,9 @@ def test_check_handle_timedout_sell_usercustom(default_conf, ticker, limit_sell_
     open_trade.is_open = False
 
     Trade.session.add(open_trade)
+    # Ensure default is false
+    freqtrade.check_handle_timedout()
+    assert cancel_order_mock.call_count == 0
 
     freqtrade.strategy.check_sell_timeout = MagicMock(return_value=False)
     # Return false - No impact
@@ -2407,30 +2414,47 @@ def test_handle_cancel_buy_corder_empty(mocker, default_conf, limit_buy_order,
     assert cancel_order_mock.call_count == 1
 
 
-def test_handle_cancel_sell_limit(mocker, default_conf) -> None:
-    patch_RPCManager(mocker)
+def test_handle_cancel_sell_limit(mocker, default_conf, fee) -> None:
+    send_msg_mock = patch_RPCManager(mocker)
     patch_exchange(mocker)
     cancel_order_mock = MagicMock()
     mocker.patch.multiple(
         'freqtrade.exchange.Exchange',
-        cancel_order=cancel_order_mock
+        cancel_order=cancel_order_mock,
     )
+    mocker.patch('freqtrade.freqtradebot.FreqtradeBot.get_sell_rate', return_value=0.245441)
 
     freqtrade = FreqtradeBot(default_conf)
-    freqtrade._notify_sell_cancel = MagicMock()
 
-    trade = MagicMock()
+    trade = Trade(
+        pair='LTC/ETH',
+        amount=2,
+        exchange='binance',
+        open_rate=0.245441,
+        open_order_id="123456",
+        open_date=arrow.utcnow().datetime,
+        fee_open=fee.return_value,
+        fee_close=fee.return_value,
+    )
     order = {'remaining': 1,
              'amount': 1,
              'status': "open"}
     reason = CANCEL_REASON['TIMEOUT']
     assert freqtrade.handle_cancel_sell(trade, order, reason)
     assert cancel_order_mock.call_count == 1
+    assert send_msg_mock.call_count == 1
+
+    send_msg_mock.reset_mock()
+
     order['amount'] = 2
-    assert (freqtrade.handle_cancel_sell(trade, order, reason)
-            == CANCEL_REASON['PARTIALLY_FILLED'])
+    assert freqtrade.handle_cancel_sell(trade, order, reason) == CANCEL_REASON['PARTIALLY_FILLED']
     # Assert cancel_order was not called (callcount remains unchanged)
     assert cancel_order_mock.call_count == 1
+    assert send_msg_mock.call_count == 1
+    assert freqtrade.handle_cancel_sell(trade, order, reason) == CANCEL_REASON['PARTIALLY_FILLED']
+    # Message should not be iterated again
+    assert trade.sell_order_status == CANCEL_REASON['PARTIALLY_FILLED']
+    assert send_msg_mock.call_count == 1
 
 
 def test_handle_cancel_sell_cancel_exception(mocker, default_conf) -> None:

tests/test_persistence.py

@@ -477,6 +477,7 @@ def test_migrate_old(mocker, default_conf, fee):
     assert trade.close_rate_requested is None
     assert trade.close_rate is not None
     assert pytest.approx(trade.close_profit_abs) == trade.calc_profit()
+    assert trade.sell_order_status is None
 
 
 def test_migrate_new(mocker, default_conf, fee, caplog):
@@ -756,6 +757,7 @@ def test_to_json(default_conf, fee):
                       'stake_amount': 0.001,
                       'close_profit': None,
                       'sell_reason': None,
+                      'sell_order_status': None,
                       'stop_loss': None,
                       'stop_loss_pct': None,
                       'initial_stop_loss': None,
@@ -810,6 +812,7 @@ def test_to_json(default_conf, fee):
                       'open_rate_requested': None,
                       'open_trade_price': 12.33075,
                       'sell_reason': None,
+                      'sell_order_status': None,
                       'strategy': None,
                       'ticker_interval': None}