merged upstream

2022-04-05 15:52:48 +05:30
parent 4833cd1217 5c01969969
commit debb8f7485
34 changed files with 358 additions and 307 deletions
--- a/tests/rpc/test_rpc_telegram.py
+++ b/tests/rpc/test_rpc_telegram.py
@@ -1052,7 +1052,7 @@ def test_telegram_forcesell_handle(default_conf, update, ticker, fee,
    assert msg_mock.call_count == 4
    last_msg = msg_mock.call_args_list[-2][0][0]
    assert {
-        'type': RPCMessageType.SELL,
+        'type': RPCMessageType.EXIT,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'ETH/BTC',
@@ -1071,8 +1071,8 @@ def test_telegram_forcesell_handle(default_conf, update, ticker, fee,
        'fiat_currency': 'USD',
        'buy_tag': ANY,
        'enter_tag': ANY,
-        'sell_reason': ExitType.FORCE_SELL.value,
-        'exit_reason': ExitType.FORCE_SELL.value,
+        'sell_reason': ExitType.FORCE_EXIT.value,
+        'exit_reason': ExitType.FORCE_EXIT.value,
        'open_date': ANY,
        'close_date': ANY,
        'close_rate': ANY,
@@ -1123,7 +1123,7 @@ def test_telegram_forcesell_down_handle(default_conf, update, ticker, fee,

    last_msg = msg_mock.call_args_list[-2][0][0]
    assert {
-        'type': RPCMessageType.SELL,
+        'type': RPCMessageType.EXIT,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'ETH/BTC',
@@ -1142,8 +1142,8 @@ def test_telegram_forcesell_down_handle(default_conf, update, ticker, fee,
        'fiat_currency': 'USD',
        'buy_tag': ANY,
        'enter_tag': ANY,
-        'sell_reason': ExitType.FORCE_SELL.value,
-        'exit_reason': ExitType.FORCE_SELL.value,
+        'sell_reason': ExitType.FORCE_EXIT.value,
+        'exit_reason': ExitType.FORCE_EXIT.value,
        'open_date': ANY,
        'close_date': ANY,
        'close_rate': ANY,
@@ -1184,7 +1184,7 @@ def test_forcesell_all_handle(default_conf, update, ticker, fee, mocker) -> None
    assert msg_mock.call_count == 8
    msg = msg_mock.call_args_list[0][0][0]
    assert {
-        'type': RPCMessageType.SELL,
+        'type': RPCMessageType.EXIT,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'ETH/BTC',
@@ -1203,8 +1203,8 @@ def test_forcesell_all_handle(default_conf, update, ticker, fee, mocker) -> None
        'fiat_currency': 'USD',
        'buy_tag': ANY,
        'enter_tag': ANY,
-        'sell_reason': ExitType.FORCE_SELL.value,
-        'exit_reason': ExitType.FORCE_SELL.value,
+        'sell_reason': ExitType.FORCE_EXIT.value,
+        'exit_reason': ExitType.FORCE_EXIT.value,
        'open_date': ANY,
        'close_date': ANY,
        'close_rate': ANY,
@@ -1797,10 +1797,10 @@ def test_show_config_handle(default_conf, update, mocker) -> None:


@pytest.mark.parametrize('message_type,enter,enter_signal,leverage', [
-    (RPCMessageType.BUY, 'Long', 'long_signal_01', None),
-    (RPCMessageType.BUY, 'Long', 'long_signal_01', 1.0),
-    (RPCMessageType.BUY, 'Long', 'long_signal_01', 5.0),
-    (RPCMessageType.SHORT, 'Short', 'short_signal_01', 2.0)])
+    (RPCMessageType.ENTRY, 'Long', 'long_signal_01', None),
+    (RPCMessageType.ENTRY, 'Long', 'long_signal_01', 1.0),
+    (RPCMessageType.ENTRY, 'Long', 'long_signal_01', 5.0),
+    (RPCMessageType.ENTRY, 'Short', 'short_signal_01', 2.0)])
 def test_send_msg_buy_notification(default_conf, mocker, caplog, message_type,
                                   enter, enter_signal, leverage) -> None:

@@ -1813,6 +1813,7 @@ def test_send_msg_buy_notification(default_conf, mocker, caplog, message_type,
        'leverage': leverage,
        'limit': 1.099e-05,
        'order_type': 'limit',
+        'direction': enter,
        'stake_amount': 0.01465333,
        'stake_amount_fiat': 0.0,
        'stake_currency': 'BTC',
@@ -1853,8 +1854,8 @@ def test_send_msg_buy_notification(default_conf, mocker, caplog, message_type,


@pytest.mark.parametrize('message_type,enter_signal', [
-    (RPCMessageType.BUY_CANCEL, 'long_signal_01'),
-    (RPCMessageType.SHORT_CANCEL, 'short_signal_01')])
+    (RPCMessageType.ENTRY_CANCEL, 'long_signal_01'),
+    (RPCMessageType.ENTRY_CANCEL, 'short_signal_01')])
 def test_send_msg_buy_cancel_notification(default_conf, mocker, message_type, enter_signal) -> None:

    telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)
@@ -1901,14 +1902,14 @@ def test_send_msg_protection_notification(default_conf, mocker, time_machine) ->


@pytest.mark.parametrize('message_type,entered,enter_signal,leverage', [
-    (RPCMessageType.BUY_FILL, 'Longed', 'long_signal_01', 1.0),
-    (RPCMessageType.BUY_FILL, 'Longed', 'long_signal_02', 2.0),
-    (RPCMessageType.SHORT_FILL, 'Shorted', 'short_signal_01', 2.0),
+    (RPCMessageType.ENTRY_FILL, 'Long', 'long_signal_01', 1.0),
+    (RPCMessageType.ENTRY_FILL, 'Long', 'long_signal_02', 2.0),
+    (RPCMessageType.ENTRY_FILL, 'Short', 'short_signal_01', 2.0),
 ])
-def test_send_msg_buy_fill_notification(default_conf, mocker, message_type, entered,
-                                        enter_signal, leverage) -> None:
+def test_send_msg_entry_fill_notification(default_conf, mocker, message_type, entered,
+                                          enter_signal, leverage) -> None:

-    default_conf['telegram']['notification_settings']['buy_fill'] = 'on'
+    default_conf['telegram']['notification_settings']['entry_fill'] = 'on'
    telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)

    telegram.send_msg({
@@ -1919,6 +1920,7 @@ def test_send_msg_buy_fill_notification(default_conf, mocker, message_type, ente
        'pair': 'ETH/BTC',
        'leverage': leverage,
        'stake_amount': 0.01465333,
+        'direction': entered,
        'stake_currency': 'BTC',
        'fiat_currency': 'USD',
        'open_rate': 1.099e-05,
@@ -1927,7 +1929,7 @@ def test_send_msg_buy_fill_notification(default_conf, mocker, message_type, ente
    })
    leverage_text = f'*Leverage:* `{leverage}`\n' if leverage != 1.0 else ''
    assert msg_mock.call_args[0][0] == (
-        f'\N{CHECK MARK} *Binance:* {entered} ETH/BTC (#1)\n'
+        f'\N{CHECK MARK} *Binance:* {entered}ed ETH/BTC (#1)\n'
        f'*Enter Tag:* `{enter_signal}`\n'
        '*Amount:* `1333.33333333`\n'
        f"{leverage_text}"
@@ -1969,7 +1971,7 @@ def test_send_msg_sell_notification(default_conf, mocker) -> None:
    old_convamount = telegram._rpc._fiat_converter.convert_amount
    telegram._rpc._fiat_converter.convert_amount = lambda a, b, c: -24.812
    telegram.send_msg({
-        'type': RPCMessageType.SELL,
+        'type': RPCMessageType.EXIT,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'KEY/ETH',
@@ -2005,7 +2007,7 @@ def test_send_msg_sell_notification(default_conf, mocker) -> None:

    msg_mock.reset_mock()
    telegram.send_msg({
-        'type': RPCMessageType.SELL,
+        'type': RPCMessageType.EXIT,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'KEY/ETH',
@@ -2085,7 +2087,7 @@ def test_send_msg_sell_cancel_notification(default_conf, mocker) -> None:
    old_convamount = telegram._rpc._fiat_converter.convert_amount
    telegram._rpc._fiat_converter.convert_amount = lambda a, b, c: -24.812
    telegram.send_msg({
-        'type': RPCMessageType.SELL_CANCEL,
+        'type': RPCMessageType.EXIT_CANCEL,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'KEY/ETH',
@@ -2097,7 +2099,7 @@ def test_send_msg_sell_cancel_notification(default_conf, mocker) -> None:

    msg_mock.reset_mock()
    telegram.send_msg({
-        'type': RPCMessageType.SELL_CANCEL,
+        'type': RPCMessageType.EXIT_CANCEL,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'KEY/ETH',
@@ -2117,11 +2119,11 @@ def test_send_msg_sell_cancel_notification(default_conf, mocker) -> None:
 def test_send_msg_sell_fill_notification(default_conf, mocker, direction,
                                         enter_signal, leverage) -> None:

-    default_conf['telegram']['notification_settings']['sell_fill'] = 'on'
+    default_conf['telegram']['notification_settings']['exit_fill'] = 'on'
    telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)

    telegram.send_msg({
-        'type': RPCMessageType.SELL_FILL,
+        'type': RPCMessageType.EXIT_FILL,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'KEY/ETH',
@@ -2194,9 +2196,9 @@ def test_send_msg_unknown_type(default_conf, mocker) -> None:


@pytest.mark.parametrize('message_type,enter,enter_signal,leverage', [
-    (RPCMessageType.BUY, 'Long', 'long_signal_01', None),
-    (RPCMessageType.BUY, 'Long', 'long_signal_01', 2.0),
-    (RPCMessageType.SHORT, 'Short', 'short_signal_01', 2.0)])
+    (RPCMessageType.ENTRY, 'Long', 'long_signal_01', None),
+    (RPCMessageType.ENTRY, 'Long', 'long_signal_01', 2.0),
+    (RPCMessageType.ENTRY, 'Short', 'short_signal_01', 2.0)])
 def test_send_msg_buy_notification_no_fiat(
        default_conf, mocker, message_type, enter, enter_signal, leverage) -> None:
    del default_conf['fiat_display_currency']
@@ -2211,6 +2213,7 @@ def test_send_msg_buy_notification_no_fiat(
        'leverage': leverage,
        'limit': 1.099e-05,
        'order_type': 'limit',
+        'direction': enter,
        'stake_amount': 0.01465333,
        'stake_amount_fiat': 0.0,
        'stake_currency': 'BTC',
@@ -2244,7 +2247,7 @@ def test_send_msg_sell_notification_no_fiat(
    telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)

    telegram.send_msg({
-        'type': RPCMessageType.SELL,
+        'type': RPCMessageType.EXIT,
        'trade_id': 1,
        'exchange': 'Binance',
        'pair': 'KEY/ETH',