Fix validation

Author: badrogger

node_cli/configs/user.py

@@ -19,16 +19,16 @@
 
 import inspect
 import os
-from typing import Dict, NamedTuple
-from dataclasses import dataclass
 from abc import ABC
+from dataclasses import dataclass
+from typing import Dict, NamedTuple
 
 from dotenv.main import DotEnv
 
-from node_cli.configs import SKALE_DIR, CONTAINER_CONFIG_PATH
-from node_cli.configs.alias_address_validation import validate_alias_or_address, ContractType
-from node_cli.utils.node_type import NodeType
+from node_cli.configs import CONTAINER_CONFIG_PATH, SKALE_DIR
+from node_cli.configs.alias_address_validation import ContractType, validate_alias_or_address
 from node_cli.utils.helper import error_exit
+from node_cli.utils.node_type import NodeType
 
 SKALE_DIR_ENV_FILEPATH = os.path.join(SKALE_DIR, '.env')
 CONFIGS_ENV_FILEPATH = os.path.join(CONTAINER_CONFIG_PATH, '.env')
@@ -149,15 +149,17 @@ def get_validated_user_config(
 def validate_user_config(user_config: BaseUserConfig) -> None:
     validate_env_type(env_type=user_config.env_type)
 
-    if  isinstance(user_config, MirageUserConfig):
+    if isinstance(user_config, MirageUserConfig):
         contract_alias_or_address = user_config.mirage_contracts
+        endpoint = user_config.boot_endpoint
     else:
         contract_alias_or_address = user_config.manager_contracts
+        endpoint = user_config.endpoint
 
-    validate_alias_or_address(contract_alias_or_address, ContractType.MANAGER, user_config.endpoint)
+    validate_alias_or_address(contract_alias_or_address, ContractType.MANAGER, endpoint)
 
     if isinstance(user_config, (SkaleUserConfig, MirageBootUserConfig)):
-        validate_alias_or_address(user_config.ima_contracts, ContractType.IMA, user_config.endpoint)
+        validate_alias_or_address(user_config.ima_contracts, ContractType.IMA, endpoint)
 
 
 def to_lower_keys(params: Dict[str, str]) -> Dict[str, str]:

tests/core/core_node_test.py

@@ -223,11 +223,7 @@ def test_compose_node_env(
     expect_backup_run,
 ):
     user_config_path = request.getfixturevalue(test_user_conf)
-    # mock_get_validated.return_value = valid_env_params.copy()
-    # if node_type == NodeType.SYNC:
-    #     mock_get_validated.return_value['ENV_TYPE'] = 'devnet'
-    # else:
-    #     mock_get_validated.return_value['ENV_TYPE'] = 'mainnet'
+
     with (
         mock.patch('node_cli.configs.user.validate_alias_or_address'),
         mock.patch('node_cli.core.node.save_env_params'),
@@ -242,10 +238,6 @@ def test_compose_node_env(
             save=True,
         )
 
-    # mock_save_params.assert_called_once_with(user_config_path)
-    # mock_get_validated.assert_called_once_with(
-    #     env_filepath=valid_env_file, node_type=node_type, is_mirage_boot=is_boot
-    # )
     assert result_env['SCHAINS_MNT_DIR'] == expected_mnt_dir
     assert (
         'FLASK_SECRET_KEY' in result_env and result_env['FLASK_SECRET_KEY'] is not None
@@ -254,7 +246,6 @@ def test_compose_node_env(
         assert result_env['FLASK_SECRET_KEY'] == 'mock_secret'
     should_have_backup = sync_schains and node_type != NodeType.SYNC
     assert ('BACKUP_RUN' in result_env and result_env['BACKUP_RUN'] == 'True') == should_have_backup
-    # assert result_env['ENDPOINT'] == valid_env_params['ENDPOINT']
 
 
 @pytest.fixture