From 5f63fdd8adb1533322afa5b8f3d67b3a77d70ec8 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Tue, 20 Oct 2020 19:39:38 +0200
Subject: [PATCH] Use better  lock message

---
 freqtrade/freqtradebot.py       | 4 ++--
 freqtrade/rpc/api_server.py     | 2 +-
 freqtrade/rpc/telegram.py       | 6 +-----
 tests/rpc/test_rpc_apiserver.py | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index e004ed51c..6112a599e 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -938,7 +938,7 @@ class FreqtradeBot:
                                     stoploss_order=True)
             # Lock pair for one candle to prevent immediate rebuys
             self.strategy.lock_pair(trade.pair, timeframe_to_next_date(self.config['timeframe']),
-                                    reason='auto_lock_1_candle')
+                                    reason='Auto lock')
             self._notify_sell(trade, "stoploss")
             return True
 
@@ -1265,7 +1265,7 @@ class FreqtradeBot:
 
         # Lock pair for one candle to prevent immediate rebuys
         self.strategy.lock_pair(trade.pair, timeframe_to_next_date(self.config['timeframe']),
-                                reason='auto_lock_1_candle')
+                                reason='Auto lock')
 
         self._notify_sell(trade, order_type)
 
diff --git a/freqtrade/rpc/api_server.py b/freqtrade/rpc/api_server.py
index 89e0f88c7..be21179ad 100644
--- a/freqtrade/rpc/api_server.py
+++ b/freqtrade/rpc/api_server.py
@@ -356,7 +356,7 @@ class ApiServer(RPC):
     def _locks(self):
         """
         Handler for /locks.
-        Returns the number of trades running
+        Returns the currently active locks.
         """
         return jsonify(self._rpc_locks())
 
diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index 18360c418..3dcb7ab72 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -15,7 +15,6 @@ from telegram.ext import CallbackContext, CommandHandler, Updater
 from telegram.utils.helpers import escape_markdown
 
 from freqtrade.__init__ import __version__
-from freqtrade.constants import DATETIME_PRINT_FORMAT
 from freqtrade.rpc import RPC, RPCException, RPCMessageType
 from freqtrade.rpc.fiat_convert import CryptoToFiatConverter
 
@@ -614,10 +613,7 @@ class Telegram(RPC):
     def _locks(self, update: Update, context: CallbackContext) -> None:
         """
         Handler for /locks.
-        Returns the number of trades running
-        :param bot: telegram bot
-        :param update: message update
-        :return: None
+        Returns the currently active locks
         """
         try:
             locks = self._rpc_locks()
diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py
index 2b4242f5a..34e959875 100644
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -4,7 +4,6 @@ Unit test file for rpc/api_server.py
 
 from datetime import datetime, timedelta
 from pathlib import Path
-from time import sleep
 from unittest.mock import ANY, MagicMock, PropertyMock
 
 import pytest