merged upstream

freqtrade/strategy/interface.py

@@ -308,10 +308,10 @@ class IStrategy(ABC, HyperStrategyMixin):
         :param time_in_force: Time in force. Defaults to GTC (Good-til-cancelled).
         :param exit_reason: Exit reason.
             Can be any of ['roi', 'stop_loss', 'stoploss_on_exchange', 'trailing_stop_loss',
-                           'sell_signal', 'force_sell', 'emergency_sell']
+                           'exit_signal', 'force_exit', 'emergency_exit']
         :param current_time: datetime object, containing the current datetime
         :param **kwargs: Ensure to keep this here so updates to this won't break your strategy.
-        :return bool: When True, then the sell-order/exit_short-order is placed on the exchange.
+        :return bool: When True, then the exit-order is placed on the exchange.
             False aborts the process
         """
         return True
@@ -635,8 +635,6 @@ class IStrategy(ABC, HyperStrategyMixin):
             dataframe[SignalTagType.ENTER_TAG.value] = None
             dataframe[SignalTagType.EXIT_TAG.value] = None
 
-        # Other Defs in strategy that want to be called every loop here
-        # twitter_sell = self.watch_twitter_feed(dataframe, metadata)
         logger.debug("Loop Analysis Launched")
 
         return dataframe
@@ -717,7 +715,7 @@ class IStrategy(ABC, HyperStrategyMixin):
         """
         Calculates current signal based based on the entry order or exit order
         columns of the dataframe.
-        Used by Bot to get the signal to buy, sell, short, or exit_short
+        Used by Bot to get the signal to enter, or exit
         :param pair: pair in format ANT/BTC
         :param timeframe: timeframe to use
         :param dataframe: Analyzed dataframe to get signal from.
@@ -751,7 +749,7 @@ class IStrategy(ABC, HyperStrategyMixin):
         is_short: bool = None
     ) -> Tuple[bool, bool, Optional[str]]:
         """
-        Calculates current exit signal based based on the buy/short or sell/exit_short
+        Calculates current exit signal based based on the dataframe
         columns of the dataframe.
         Used by Bot to get the signal to exit.
         depending on is_short, looks at "short" or "long" columns.
@@ -788,9 +786,9 @@ class IStrategy(ABC, HyperStrategyMixin):
         dataframe: DataFrame,
     ) -> Tuple[Optional[SignalDirection], Optional[str]]:
         """
-        Calculates current entry signal based based on the buy/short or sell/exit_short
+        Calculates current entry signal based based on the dataframe signals
         columns of the dataframe.
-        Used by Bot to get the signal to buy, sell, short, or exit_short
+        Used by Bot to get the signal to enter trades.
         :param pair: pair in format ANT/BTC
         :param timeframe: timeframe to use
         :param dataframe: Analyzed dataframe to get signal from.
@@ -868,7 +866,7 @@ class IStrategy(ABC, HyperStrategyMixin):
                                               current_profit=current_profit,
                                               force_stoploss=force_stoploss, low=low, high=high)
 
-        # Set current rate to high for backtesting sell
+        # Set current rate to high for backtesting exits
         current_rate = (low if trade.is_short else high) or rate
         current_profit = trade.calc_profit_ratio(current_rate)
 
@@ -888,14 +886,14 @@ class IStrategy(ABC, HyperStrategyMixin):
             pass
         elif self.use_sell_signal and not enter:
             if exit_:
-                exit_signal = ExitType.SELL_SIGNAL
+                exit_signal = ExitType.EXIT_SIGNAL
             else:
                 trade_type = "exit_short" if trade.is_short else "sell"
                 custom_reason = strategy_safe_wrapper(self.custom_exit, default_retval=False)(
                     pair=trade.pair, trade=trade, current_time=current_time,
                     current_rate=current_rate, current_profit=current_profit)
                 if custom_reason:
-                    exit_signal = ExitType.CUSTOM_SELL
+                    exit_signal = ExitType.CUSTOM_EXIT
                     if isinstance(custom_reason, str):
                         if len(custom_reason) > CUSTOM_EXIT_MAX_LENGTH:
                             logger.warning(f'Custom {trade_type} reason returned from '
@@ -904,7 +902,7 @@ class IStrategy(ABC, HyperStrategyMixin):
                             custom_reason = custom_reason[:CUSTOM_EXIT_MAX_LENGTH]
                     else:
                         custom_reason = None
-            if exit_signal in (ExitType.CUSTOM_SELL, ExitType.SELL_SIGNAL):
+            if exit_signal in (ExitType.CUSTOM_EXIT, ExitType.EXIT_SIGNAL):
                 logger.debug(f"{trade.pair} - Sell signal received. "
                              f"exit_type=ExitType.{exit_signal.name}" +
                              (f", custom_reason={custom_reason}" if custom_reason else ""))
@@ -1033,9 +1031,9 @@ class IStrategy(ABC, HyperStrategyMixin):
     def min_roi_reached(self, trade: Trade, current_profit: float, current_time: datetime) -> bool:
         """
         Based on trade duration, current profit of the trade and ROI configuration,
-        decides whether bot should sell.
+        decides whether bot should exit.
         :param current_profit: current profit as ratio
-        :return: True if bot should sell at current rate
+        :return: True if bot should exit at current rate
         """
         # Check if time matches and current rate is above threshold
         trade_dur = int((current_time.timestamp() - trade.open_date_utc.timestamp()) // 60)
@@ -1134,7 +1132,7 @@ class IStrategy(ABC, HyperStrategyMixin):
         :param dataframe: DataFrame
         :param metadata: Additional information dictionary, with details like the
             currently traded pair
-        :return: DataFrame with sell column
+        :return: DataFrame with exit column
         """
 
         logger.debug(f"Populating exit signals for pair {metadata.get('pair')}.")