chore: realign enums imports

freqtrade/configuration/configuration.py

@@ -13,8 +13,7 @@ from freqtrade.configuration.deprecated_settings import process_temporary_deprec
 from freqtrade.configuration.directory_operations import create_datadir, create_userdata_dir
 from freqtrade.configuration.environment_vars import enironment_vars_to_dict
 from freqtrade.configuration.load_config import load_config_file, load_file
-from freqtrade.enums import NON_UTIL_MODES, TRADING_MODES, CandleType, RunMode
-from freqtrade.enums.tradingmode import TradingMode
+from freqtrade.enums import NON_UTIL_MODES, TRADING_MODES, CandleType, RunMode, TradingMode
 from freqtrade.exceptions import OperationalException
 from freqtrade.loggers import setup_logging
 from freqtrade.misc import deep_merge_dicts, parse_db_uri_for_logging

freqtrade/rpc/api_server/api_schemas.py

@@ -4,8 +4,7 @@ from typing import Any, Dict, List, Optional, Union
 from pydantic import BaseModel
 
 from freqtrade.constants import DATETIME_PRINT_FORMAT
-from freqtrade.enums import OrderTypeValues, SignalDirection
-from freqtrade.enums.tradingmode import TradingMode
+from freqtrade.enums import OrderTypeValues, SignalDirection, TradingMode
 
 
 class Ping(BaseModel):

freqtrade/rpc/rpc.py

@@ -18,9 +18,7 @@ from freqtrade import __version__
 from freqtrade.configuration.timerange import TimeRange
 from freqtrade.constants import CANCEL_REASON, DATETIME_PRINT_FORMAT
 from freqtrade.data.history import load_data
-from freqtrade.enums import SellType, State
-from freqtrade.enums.signaltype import SignalDirection
-from freqtrade.enums.tradingmode import TradingMode
+from freqtrade.enums import SellType, SignalDirection, State, TradingMode
 from freqtrade.exceptions import ExchangeError, PricingError
 from freqtrade.exchange import timeframe_to_minutes, timeframe_to_msecs
 from freqtrade.loggers import bufferHandler

freqtrade/rpc/telegram.py

@@ -23,9 +23,7 @@ from telegram.utils.helpers import escape_markdown
 
 from freqtrade.__init__ import __version__
 from freqtrade.constants import DUST_PER_COIN
-from freqtrade.enums import RPCMessageType
-from freqtrade.enums.signaltype import SignalDirection
-from freqtrade.enums.tradingmode import TradingMode
+from freqtrade.enums import RPCMessageType, SignalDirection, TradingMode
 from freqtrade.exceptions import OperationalException
 from freqtrade.misc import chunks, plural, round_coin_value
 from freqtrade.persistence import Trade

freqtrade/strategy/interface.py

@@ -13,8 +13,8 @@ from pandas import DataFrame
 
 from freqtrade.constants import ListPairsWithTimeframes
 from freqtrade.data.dataprovider import DataProvider
-from freqtrade.enums import CandleType, SellType, SignalDirection, SignalTagType, SignalType
-from freqtrade.enums.tradingmode import TradingMode
+from freqtrade.enums import (CandleType, SellType, SignalDirection, SignalTagType, SignalType,
+                             TradingMode)
 from freqtrade.exceptions import OperationalException, StrategyError
 from freqtrade.exchange import timeframe_to_minutes, timeframe_to_seconds
 from freqtrade.exchange.exchange import timeframe_to_next_date

tests/rpc/test_rpc.py

@@ -8,8 +8,7 @@ import pytest
 from numpy import isnan
 
 from freqtrade.edge import PairInfo
-from freqtrade.enums import State, TradingMode
-from freqtrade.enums.signaltype import SignalDirection
+from freqtrade.enums import SignalDirection, State, TradingMode
 from freqtrade.exceptions import ExchangeError, InvalidOrderException, TemporaryError
 from freqtrade.persistence import Trade
 from freqtrade.persistence.models import Order

tests/rpc/test_rpc_apiserver.py

@@ -17,8 +17,7 @@ from numpy import isnan
 from requests.auth import _basic_auth_str
 
 from freqtrade.__init__ import __version__
-from freqtrade.enums import CandleType, RunMode, State
-from freqtrade.enums.tradingmode import TradingMode
+from freqtrade.enums import CandleType, RunMode, State, TradingMode
 from freqtrade.exceptions import DependencyException, ExchangeError, OperationalException
 from freqtrade.loggers import setup_logging, setup_logging_pre
 from freqtrade.persistence import PairLocks, Trade

tests/rpc/test_rpc_telegram.py

@@ -18,8 +18,7 @@ from telegram.error import BadRequest, NetworkError, TelegramError
 from freqtrade import __version__
 from freqtrade.constants import CANCEL_REASON
 from freqtrade.edge import PairInfo
-from freqtrade.enums import RPCMessageType, RunMode, SellType, State
-from freqtrade.enums.signaltype import SignalDirection
+from freqtrade.enums import RPCMessageType, RunMode, SellType, SignalDirection, State
 from freqtrade.exceptions import OperationalException
 from freqtrade.freqtradebot import FreqtradeBot
 from freqtrade.loggers import setup_logging