From 1272a15c35e57a129d9698ebdc3a57f9dac9dd7f Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Thu, 21 Dec 2023 18:11:49 +0100
Subject: [PATCH] Properly name Entry / exit types

---
 freqtrade/freqtradebot.py  | 10 +++++-----
 freqtrade/rpc/rpc_types.py | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 7b820bfc1..772e36a3f 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -33,8 +33,8 @@ from freqtrade.plugins.protectionmanager import ProtectionManager
 from freqtrade.resolvers import ExchangeResolver, StrategyResolver
 from freqtrade.rpc import RPCManager
 from freqtrade.rpc.external_message_consumer import ExternalMessageConsumer
-from freqtrade.rpc.rpc_types import (RPCBuyMsg, RPCCancelMsg, RPCProtectionMsg, RPCSellCancelMsg,
-                                     RPCSellMsg)
+from freqtrade.rpc.rpc_types import (RPCCancelMsg, RPCEntryMsg, RPCExitCancelMsg, RPCExitMsg,
+                                     RPCProtectionMsg)
 from freqtrade.strategy.interface import IStrategy
 from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper
 from freqtrade.util import FtPrecise
@@ -1015,7 +1015,7 @@ class FreqtradeBot(LoggingMixin):
             current_rate = self.exchange.get_rate(
                 trade.pair, side='entry', is_short=trade.is_short, refresh=False)
 
-        msg: RPCBuyMsg = {
+        msg: RPCEntryMsg = {
             'trade_id': trade.id,
             'type': RPCMessageType.ENTRY_FILL if fill else RPCMessageType.ENTRY,
             'buy_tag': trade.enter_tag,
@@ -1794,7 +1794,7 @@ class FreqtradeBot(LoggingMixin):
             amount = trade.amount
         gain = "profit" if profit.profit_ratio > 0 else "loss"
 
-        msg: RPCSellMsg = {
+        msg: RPCExitMsg = {
             'type': (RPCMessageType.EXIT_FILL if fill
                      else RPCMessageType.EXIT),
             'trade_id': trade.id,
@@ -1848,7 +1848,7 @@ class FreqtradeBot(LoggingMixin):
             trade.pair, side='exit', is_short=trade.is_short, refresh=False)
         gain = "profit" if profit.profit_ratio > 0 else "loss"
 
-        msg: RPCSellCancelMsg = {
+        msg: RPCExitCancelMsg = {
             'type': RPCMessageType.EXIT_CANCEL,
             'trade_id': trade.id,
             'exchange': trade.exchange.capitalize(),
diff --git a/freqtrade/rpc/rpc_types.py b/freqtrade/rpc/rpc_types.py
index 23f3ed5a9..c2f05bba5 100644
--- a/freqtrade/rpc/rpc_types.py
+++ b/freqtrade/rpc/rpc_types.py
@@ -41,7 +41,7 @@ class RPCWhitelistMsg(RPCSendMsgBase):
     data: List[str]
 
 
-class __RPCBuyMsgBase(RPCSendMsgBase):
+class __RPCEntryExitMsgBase(RPCSendMsgBase):
     trade_id: int
     buy_tag: Optional[str]
     enter_tag: Optional[str]
@@ -62,16 +62,16 @@ class __RPCBuyMsgBase(RPCSendMsgBase):
     sub_trade: bool
 
 
-class RPCBuyMsg(__RPCBuyMsgBase):
+class RPCEntryMsg(__RPCEntryExitMsgBase):
     type: Literal[RPCMessageType.ENTRY, RPCMessageType.ENTRY_FILL]
 
 
-class RPCCancelMsg(__RPCBuyMsgBase):
+class RPCCancelMsg(__RPCEntryExitMsgBase):
     type: Literal[RPCMessageType.ENTRY_CANCEL]
     reason: str
 
 
-class RPCSellMsg(__RPCBuyMsgBase):
+class RPCExitMsg(__RPCEntryExitMsgBase):
     type: Literal[RPCMessageType.EXIT, RPCMessageType.EXIT_FILL]
     cumulative_profit: float
     gain: str  # Literal["profit", "loss"]
@@ -85,7 +85,7 @@ class RPCSellMsg(__RPCBuyMsgBase):
     order_rate: Optional[float]
 
 
-class RPCSellCancelMsg(__RPCBuyMsgBase):
+class RPCExitCancelMsg(__RPCEntryExitMsgBase):
     type: Literal[RPCMessageType.EXIT_CANCEL]
     reason: str
     gain: str  # Literal["profit", "loss"]
@@ -119,10 +119,10 @@ RPCSendMsg = Union[
     RPCStrategyMsg,
     RPCProtectionMsg,
     RPCWhitelistMsg,
-    RPCBuyMsg,
+    RPCEntryMsg,
     RPCCancelMsg,
-    RPCSellMsg,
-    RPCSellCancelMsg,
+    RPCExitMsg,
+    RPCExitCancelMsg,
     RPCAnalyzedDFMsg,
     RPCNewCandleMsg
     ]