Capture FtBaseException at the outermost level

freqtrade/exceptions.py

@@ -1,21 +1,27 @@
 
 
-class DependencyException(Exception):
+class FreqtradeException(Exception):
     """
-    Indicates that an assumed dependency is not met.
-    This could happen when there is currently not enough money on the account.
+    Freqtrade base exception. Handled at the outermost level.
+    All other exception types are subclasses of this exception type.
+    """
+
+
+class OperationalException(FreqtradeException):
+    """
+    Requires manual intervention and will stop the bot.
+    Most of the time, this is caused by an invalid Configuration.
     """
 
 
-class OperationalException(Exception):
+class DependencyException(FreqtradeException):
     """
-    Requires manual intervention and will usually stop the bot.
-    This happens when an exchange returns an unexpected error during runtime
-    or given configuration is invalid.
+    Indicates that an assumed dependency is not met.
+    This could happen when there is currently not enough money on the account.
     """
 
 
-class InvalidOrderException(Exception):
+class InvalidOrderException(FreqtradeException):
     """
     This is returned when the order is not valid. Example:
     If stoploss on exchange order is hit, then trying to cancel the order
@@ -23,7 +29,7 @@ class InvalidOrderException(Exception):
     """
 
 
-class TemporaryError(Exception):
+class TemporaryError(FreqtradeException):
     """
     Temporary network or exchange related error.
     This could happen when an exchange is congested, unavailable, or the user

freqtrade/main.py

@@ -4,6 +4,7 @@ Main Freqtrade bot script.
 Read the documentation to know what cli arguments you need.
 """
 
+from freqtrade.exceptions import FreqtradeException, OperationalException
 import sys
 # check min. python version
 if sys.version_info < (3, 6):
@@ -14,7 +15,6 @@ import logging
 from typing import Any, List
 
 from freqtrade.configuration import Arguments
-from freqtrade.exceptions import OperationalException
 
 
 logger = logging.getLogger('freqtrade')
@@ -50,7 +50,7 @@ def main(sysargv: List[str] = None) -> None:
     except KeyboardInterrupt:
         logger.info('SIGINT received, aborting ...')
         return_code = 0
-    except OperationalException as e:
+    except FreqtradeException as e:
         logger.error(str(e))
         return_code = 2
     except Exception:

tests/test_main.py

@@ -6,7 +6,7 @@ from unittest.mock import MagicMock, PropertyMock
 import pytest
 
 from freqtrade.configuration import Arguments
-from freqtrade.exceptions import OperationalException
+from freqtrade.exceptions import OperationalException, FreqtradeException
 from freqtrade.freqtradebot import FreqtradeBot
 from freqtrade.main import main
 from freqtrade.state import State
@@ -96,7 +96,7 @@ def test_main_operational_exception(mocker, default_conf, caplog) -> None:
     mocker.patch('freqtrade.freqtradebot.FreqtradeBot.cleanup', MagicMock())
     mocker.patch(
         'freqtrade.worker.Worker._worker',
-        MagicMock(side_effect=OperationalException('Oh snap!'))
+        MagicMock(side_effect=FreqtradeException('Oh snap!'))
     )
     patched_configuration_load_config_file(mocker, default_conf)
     mocker.patch('freqtrade.wallets.Wallets.update', MagicMock())