Merge branch 'develop' into feat/short

tests/exchange/test_exchange.py

@@ -2720,37 +2720,36 @@ def test_cancel_stoploss_order_with_result(default_conf, mocker, exchange_name):
     default_conf['dry_run'] = False
     mocker.patch('freqtrade.exchange.Exchange.fetch_stoploss_order', return_value={'for': 123})
     mocker.patch('freqtrade.exchange.Ftx.fetch_stoploss_order', return_value={'for': 123})
+    mocker.patch('freqtrade.exchange.Gateio.fetch_stoploss_order', return_value={'for': 123})
     exchange = get_patched_exchange(mocker, default_conf, id=exchange_name)
 
-    mocker.patch('freqtrade.exchange.Exchange.cancel_stoploss_order',
-                 return_value={'fee': {}, 'status': 'canceled', 'amount': 1234})
-    mocker.patch('freqtrade.exchange.Ftx.cancel_stoploss_order',
-                 return_value={'fee': {}, 'status': 'canceled', 'amount': 1234})
+    res = {'fee': {}, 'status': 'canceled', 'amount': 1234}
+    mocker.patch('freqtrade.exchange.Exchange.cancel_stoploss_order', return_value=res)
+    mocker.patch('freqtrade.exchange.Ftx.cancel_stoploss_order', return_value=res)
+    mocker.patch('freqtrade.exchange.Gateio.cancel_stoploss_order', return_value=res)
     co = exchange.cancel_stoploss_order_with_result(order_id='_', pair='TKN/BTC', amount=555)
-    assert co == {'fee': {}, 'status': 'canceled', 'amount': 1234}
+    assert co == res
 
-    mocker.patch('freqtrade.exchange.Exchange.cancel_stoploss_order',
-                 return_value='canceled')
-    mocker.patch('freqtrade.exchange.Ftx.cancel_stoploss_order',
-                 return_value='canceled')
+    mocker.patch('freqtrade.exchange.Exchange.cancel_stoploss_order', return_value='canceled')
+    mocker.patch('freqtrade.exchange.Ftx.cancel_stoploss_order', return_value='canceled')
+    mocker.patch('freqtrade.exchange.Gateio.cancel_stoploss_order', return_value='canceled')
     # Fall back to fetch_stoploss_order
     co = exchange.cancel_stoploss_order_with_result(order_id='_', pair='TKN/BTC', amount=555)
     assert co == {'for': 123}
 
-    mocker.patch('freqtrade.exchange.Exchange.fetch_stoploss_order',
-                 side_effect=InvalidOrderException(""))
-    mocker.patch('freqtrade.exchange.Ftx.fetch_stoploss_order',
-                 side_effect=InvalidOrderException(""))
-
+    exc = InvalidOrderException("")
+    mocker.patch('freqtrade.exchange.Exchange.fetch_stoploss_order', side_effect=exc)
+    mocker.patch('freqtrade.exchange.Ftx.fetch_stoploss_order', side_effect=exc)
+    mocker.patch('freqtrade.exchange.Gateio.fetch_stoploss_order', side_effect=exc)
     co = exchange.cancel_stoploss_order_with_result(order_id='_', pair='TKN/BTC', amount=555)
     assert co['amount'] == 555
     assert co == {'fee': {}, 'status': 'canceled', 'amount': 555, 'info': {}}
 
     with pytest.raises(InvalidOrderException):
-        mocker.patch('freqtrade.exchange.Exchange.cancel_stoploss_order',
-                     side_effect=InvalidOrderException("Did not find order"))
-        mocker.patch('freqtrade.exchange.Ftx.cancel_stoploss_order',
-                     side_effect=InvalidOrderException("Did not find order"))
+        exc = InvalidOrderException("Did not find order")
+        mocker.patch('freqtrade.exchange.Exchange.cancel_stoploss_order', side_effect=exc)
+        mocker.patch('freqtrade.exchange.Ftx.cancel_stoploss_order', side_effect=exc)
+        mocker.patch('freqtrade.exchange.Gateio.cancel_stoploss_order', side_effect=exc)
         exchange = get_patched_exchange(mocker, default_conf, id=exchange_name)
         exchange.cancel_stoploss_order_with_result(order_id='_', pair='TKN/BTC', amount=123)
 

tests/exchange/test_gateio.py

@@ -1,8 +1,11 @@
+from unittest.mock import MagicMock
+
 import pytest
 
 from freqtrade.exceptions import OperationalException
 from freqtrade.exchange import Gateio
 from freqtrade.resolvers.exchange_resolver import ExchangeResolver
+from tests.conftest import get_patched_exchange
 
 
 def test_validate_order_types_gateio(default_conf, mocker):
@@ -26,3 +29,39 @@ def test_validate_order_types_gateio(default_conf, mocker):
     with pytest.raises(OperationalException,
                        match=r'Exchange .* does not support market orders.'):
         ExchangeResolver.load_exchange('gateio', default_conf, True)
+
+
+def test_fetch_stoploss_order_gateio(default_conf, mocker):
+    exchange = get_patched_exchange(mocker, default_conf, id='gateio')
+
+    fetch_order_mock = MagicMock()
+    exchange.fetch_order = fetch_order_mock
+
+    exchange.fetch_stoploss_order('1234', 'ETH/BTC')
+    assert fetch_order_mock.call_count == 1
+    assert fetch_order_mock.call_args_list[0][1]['order_id'] == '1234'
+    assert fetch_order_mock.call_args_list[0][1]['pair'] == 'ETH/BTC'
+    assert fetch_order_mock.call_args_list[0][1]['params'] == {'stop': True}
+
+
+def test_cancel_stoploss_order_gateio(default_conf, mocker):
+    exchange = get_patched_exchange(mocker, default_conf, id='gateio')
+
+    cancel_order_mock = MagicMock()
+    exchange.cancel_order = cancel_order_mock
+
+    exchange.cancel_stoploss_order('1234', 'ETH/BTC')
+    assert cancel_order_mock.call_count == 1
+    assert cancel_order_mock.call_args_list[0][1]['order_id'] == '1234'
+    assert cancel_order_mock.call_args_list[0][1]['pair'] == 'ETH/BTC'
+    assert cancel_order_mock.call_args_list[0][1]['params'] == {'stop': True}
+
+
+def test_stoploss_adjust_gateio(mocker, default_conf):
+    exchange = get_patched_exchange(mocker, default_conf, id='gateio')
+    order = {
+        'price': 1500,
+        'stopPrice': 1500,
+    }
+    assert exchange.stoploss_adjust(1501, order)
+    assert not exchange.stoploss_adjust(1499, order)