merged upstream

freqtrade/enums/exittype.py

@@ -9,11 +9,11 @@ class ExitType(Enum):
     STOP_LOSS = "stop_loss"
     STOPLOSS_ON_EXCHANGE = "stoploss_on_exchange"
     TRAILING_STOP_LOSS = "trailing_stop_loss"
-    SELL_SIGNAL = "sell_signal"
-    FORCE_SELL = "force_sell"
-    EMERGENCY_SELL = "emergency_sell"
-    CUSTOM_SELL = "custom_sell"
-    PARTIAL_SELL = "partial_sell"
+    EXIT_SIGNAL = "exit_signal"
+    FORCE_EXIT = "force_exit"
+    EMERGENCY_EXIT = "emergency_exit"
+    CUSTOM_EXIT = "custom_exit"
+    PARTIAL_EXIT = "partial_exit"
     NONE = ""
 
     def __str__(self):

freqtrade/enums/rpcmessagetype.py

@@ -6,19 +6,13 @@ class RPCMessageType(Enum):
     WARNING = 'warning'
     STARTUP = 'startup'
 
-    BUY = 'buy'
-    BUY_FILL = 'buy_fill'
-    BUY_CANCEL = 'buy_cancel'
+    ENTRY = 'entry'
+    ENTRY_FILL = 'entry_fill'
+    ENTRY_CANCEL = 'entry_cancel'
 
-    SHORT = 'short'
-    SHORT_FILL = 'short_fill'
-    SHORT_CANCEL = 'short_cancel'
-
-    # TODO: The below messagetypes should be renamed to "exit"!
-    # Careful - has an impact on webhooks, therefore needs proper communication
-    SELL = 'sell'
-    SELL_FILL = 'sell_fill'
-    SELL_CANCEL = 'sell_cancel'
+    EXIT = 'exit'
+    EXIT_FILL = 'exit_fill'
+    EXIT_CANCEL = 'exit_cancel'
 
     PROTECTION_TRIGGER = 'protection_trigger'
     PROTECTION_TRIGGER_GLOBAL = 'protection_trigger_global'