migrate trading config keys into commons

Author: Guillaume De Saint Martin

Services/Interfaces/web_interface/controllers/configuration.py

@@ -15,7 +15,7 @@
 #  License along with this library.
 import flask
 
-import octobot_trading.constants as trading_constants
+import octobot_commons.constants as commons_constants
 import octobot_services.constants as services_constants
 import tentacles.Services.Interfaces.web_interface.constants as constants
 import tentacles.Services.Interfaces.web_interface.login as login
@@ -98,16 +98,16 @@ def config():
 
         return flask.render_template('config.html',
 
-                                     config_exchanges=display_config[trading_constants.CONFIG_EXCHANGES],
-                                     config_trading=display_config[trading_constants.CONFIG_TRADING],
-                                     config_trader=display_config[trading_constants.CONFIG_TRADER],
-                                     config_trader_simulator=display_config[trading_constants.CONFIG_SIMULATOR],
+                                     config_exchanges=display_config[commons_constants.CONFIG_EXCHANGES],
+                                     config_trading=display_config[commons_constants.CONFIG_TRADING],
+                                     config_trader=display_config[commons_constants.CONFIG_TRADER],
+                                     config_trader_simulator=display_config[commons_constants.CONFIG_SIMULATOR],
                                      config_notifications=display_config[
                                          services_constants.CONFIG_CATEGORY_NOTIFICATION],
                                      config_services=display_config[services_constants.CONFIG_CATEGORY_SERVICES],
                                      config_symbols=models.format_config_symbols(display_config),
-                                     config_reference_market=display_config[trading_constants.CONFIG_TRADING][
-                                         trading_constants.CONFIG_TRADER_REFERENCE_MARKET],
+                                     config_reference_market=display_config[commons_constants.CONFIG_TRADING][
+                                         commons_constants.CONFIG_TRADER_REFERENCE_MARKET],
 
                                      real_trader_activated=interfaces_util.has_real_and_or_simulated_traders()[0],
 
@@ -118,7 +118,7 @@ def config():
                                      notifiers_list=notifiers_list,
                                      symbol_list=sorted(models.get_symbol_list([exchange
                                                                                 for exchange in display_config[
-                                                                                    trading_constants.CONFIG_EXCHANGES]])),
+                                                                                    commons_constants.CONFIG_EXCHANGES]])),
                                      full_symbol_list=models.get_all_symbols_dict(),
                                      strategy_config=models.get_strategy_config(media_url),
                                      evaluator_startup_config=models.get_evaluators_tentacles_startup_activation(),

Services/Interfaces/web_interface/models/configuration.py

@@ -27,9 +27,9 @@
 import octobot_trading.modes as trading_modes
 import tentacles.Services.Interfaces.web_interface.constants as constants
 import octobot_evaluators.constants as evaluators_constants
+import octobot_services.interfaces.util as interfaces_util
 import octobot_commons.constants as commons_constants
 import octobot_commons.logging as bot_logging
-import octobot_services.interfaces.util as interfaces_util
 import octobot_commons.config_manager as config_manager
 import octobot_commons.tentacles_management as tentacles_management
 import octobot_backtesting.api as backtesting_api
@@ -536,7 +536,7 @@ def get_exchange_logo(exchange_name):
 def get_full_exchange_list(remove_config_exchanges=False):
     g_config = interfaces_util.get_global_config()
     if remove_config_exchanges:
-        user_exchanges = [e for e in g_config[trading_constants.CONFIG_EXCHANGES]]
+        user_exchanges = [e for e in g_config[commons_constants.CONFIG_EXCHANGES]]
         full_exchange_list = list(set(ccxt.exchanges) - set(user_exchanges))
     else:
         full_exchange_list = list(set(ccxt.exchanges))
@@ -563,7 +563,7 @@ def get_other_exchange_list(remove_config_exchanges=False):
 
 def get_current_exchange():
     g_config = interfaces_util.get_global_config()
-    exchanges = g_config[trading_constants.CONFIG_EXCHANGES]
+    exchanges = g_config[commons_constants.CONFIG_EXCHANGES]
     if exchanges:
         return next(iter(exchanges))
     else:

Trading/Mode/arbitrage_trading_mode/tests/__init__.py

@@ -19,9 +19,9 @@
 import octobot_backtesting.api as backtesting_api
 import async_channel.util as channel_util
 import octobot_commons.tests.test_config as test_config
+import octobot_commons.constants as commons_constants
 import octobot_trading.api as trading_api
 import octobot_trading.exchange_channel as exchanges_channel
-import octobot_trading.constants as trading_constants
 import octobot_trading.exchanges as exchanges
 import tentacles.Trading.Mode as modes
 
@@ -31,7 +31,7 @@ async def exchange(exchange_name, backtesting=None, symbol="BTC/USDT"):
     exchange_manager = None
     try:
         config = test_config.load_test_config()
-        config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
+        config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
         exchange_manager = exchanges.ExchangeManager(config, exchange_name)
 
         # use backtesting not to spam exchanges apis

Trading/Mode/daily_trading_mode/tests/test_daily_trading_mode_consumer.py

@@ -40,11 +40,11 @@
 async def _get_tools():
     symbol = "BTC/USDT"
     config = test_config.load_test_config()
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO][
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO][
         "SUB"] = 0.000000000000000000005
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO][
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO][
         "BNB"] = 0.000000000000000000005
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
     exchange_manager = exchanges.ExchangeManager(config, "binance")
 
     # use backtesting not to spam exchanges apis

Trading/Mode/daily_trading_mode/tests/test_daily_trading_mode_producer.py

@@ -25,7 +25,6 @@
 import octobot_evaluators.api as evaluators_api
 import octobot_trading.api as trading_api
 import octobot_trading.exchange_channel as exchanges_channel
-import octobot_trading.constants as trading_constants
 import octobot_trading.enums as trading_enums
 import octobot_trading.exchanges as exchanges
 import tentacles.Trading.Mode as Mode
@@ -36,7 +35,7 @@
 
 async def _get_tools(symbol="BTC/USDT"):
     config = test_config.load_test_config()
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 1000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 1000
     exchange_manager = exchanges.ExchangeManager(config, "binance")
 
     # use backtesting not to spam exchanges apis

Trading/Mode/dip_analyser_trading_mode/tests/test_dip_analyser_trading_mode.py

@@ -41,7 +41,7 @@
 
 async def _get_tools(symbol="BTC/USDT"):
     config = test_config.load_test_config()
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
     exchange_manager = exchanges.ExchangeManager(config, "binance")
 
     # use backtesting not to spam exchanges apis

Trading/Mode/staggered_orders_trading_mode/tests/test_staggered_orders_trading_mode.py

@@ -27,7 +27,6 @@
 import octobot_commons.tests.test_config as test_config
 import octobot_trading.api as trading_api
 import octobot_trading.exchange_channel as exchanges_channel
-import octobot_trading.constants as trading_constants
 import octobot_trading.enums as trading_enums
 import octobot_trading.exchanges as exchanges
 import octobot_trading.personal_data as trading_personal_data
@@ -53,15 +52,15 @@ async def _init_trading_mode(config, exchange_manager, symbol):
 
 async def _get_tools(symbol, btc_holdings=None, additional_portfolio={}, fees=None):
     config = test_config.load_test_config()
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USD"] = 1000
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO][
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USD"] = 1000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO][
         "BTC"] = 10 if btc_holdings is None else btc_holdings
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO].update(additional_portfolio)
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO].update(additional_portfolio)
     if fees is not None:
-        config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_SIMULATOR_FEES][
-            trading_constants.CONFIG_SIMULATOR_FEES_TAKER] = fees
-        config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_SIMULATOR_FEES][
-            trading_constants.CONFIG_SIMULATOR_FEES_MAKER] = fees
+        config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_SIMULATOR_FEES][
+            commons_constants.CONFIG_SIMULATOR_FEES_TAKER] = fees
+        config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_SIMULATOR_FEES][
+            commons_constants.CONFIG_SIMULATOR_FEES_MAKER] = fees
     exchange_manager = exchanges.ExchangeManager(config, "binance")
 
     # use backtesting not to spam exchanges apis
@@ -100,11 +99,11 @@ async def _get_tools(symbol, btc_holdings=None, additional_portfolio={}, fees=No
 
 async def _get_tools_multi_symbol():
     config = test_config.load_test_config()
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USD"] = 1000
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["BTC"] = 10
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["ETH"] = 20
-    config[trading_constants.CONFIG_SIMULATOR][trading_constants.CONFIG_STARTING_PORTFOLIO]["NANO"] = 2000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USD"] = 1000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["USDT"] = 2000
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["BTC"] = 10
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["ETH"] = 20
+    config[commons_constants.CONFIG_SIMULATOR][commons_constants.CONFIG_STARTING_PORTFOLIO]["NANO"] = 2000
     exchange_manager = exchanges.ExchangeManager(config, "binance")
 
     # use backtesting not to spam exchanges apis