Update node-cli to use skale core package

dmytrotkk · dmytrotkk · commit 070111caad27 · 2026-02-16T13:15:06.000Z
diff --git a/node_cli/cli/node.py b/node_cli/cli/node.py
@@ -21,7 +21,7 @@
 
 import click
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 from node_cli.cli.info import TYPE
 from node_cli.core.node import (
     cleanup as cleanup_skale,
diff --git a/node_cli/cli/schains.py b/node_cli/cli/schains.py
@@ -21,7 +21,7 @@
 
 import click
 
-from skale.core.settings import get_settings
+from skale_core.settings import get_settings
 
 from node_cli.utils.helper import abort_if_false, URL_TYPE
 from node_cli.core.schains import (
diff --git a/node_cli/core/checks.py b/node_cli/core/checks.py
@@ -48,7 +48,7 @@
 from debian import debian_support
 from packaging.version import parse as version_parse
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 
 from node_cli.configs import (
     CHECK_REPORT_PATH,
diff --git a/node_cli/core/host.py b/node_cli/core/host.py
@@ -22,7 +22,7 @@
 from shutil import chown
 from urllib.parse import urlparse
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 
 from node_cli.core.resources import update_resource_allocation
 from node_cli.utils.helper import error_exit
diff --git a/node_cli/core/node.py b/node_cli/core/node.py
@@ -88,7 +88,7 @@
     print_node_info,
 )
 from node_cli.utils.settings import validate_and_save_node_settings
-from skale.core.settings import get_settings
+from skale_core.settings import get_settings
 from node_cli.utils.texts import safe_load_texts
 
 logger = logging.getLogger(__name__)
@@ -242,7 +242,7 @@ def update_passive(config_file: str) -> None:
 def cleanup(node_mode: NodeMode, prune: bool = False) -> None:
     node_mode = upsert_node_mode(node_mode=node_mode)
     env = compose_node_env(NodeType.SKALE, node_mode)
-    cleanup_skale_op(node_mode=node_mode, env=env, prune=prune)
+    cleanup_skale_op(node_mode=node_mode, compose_env=env, prune=prune)
     logger.info('SKALE node was cleaned up, all containers and data removed')
 
 
diff --git a/node_cli/core/resources.py b/node_cli/core/resources.py
@@ -24,7 +24,7 @@
 
 import psutil
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 
 from node_cli.utils.settings import validate_and_save_node_settings
 from node_cli.utils.docker_utils import ensure_volume
diff --git a/node_cli/core/schains.py b/node_cli/core/schains.py
@@ -26,7 +26,7 @@
 from pathlib import Path
 from typing import Dict, Optional
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 
 from lvmpy.src.core import mount, volume_mountpoint
 from node_cli.configs import (
diff --git a/node_cli/core/static_config.py b/node_cli/core/static_config.py
@@ -28,7 +28,7 @@
 )
 from node_cli.utils.node_type import NodeType
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 
 
 def get_static_params(
diff --git a/node_cli/fair/common.py b/node_cli/fair/common.py
@@ -40,7 +40,7 @@
 from node_cli.utils.print_formatters import print_node_cmd_error
 from node_cli.utils.settings import validate_and_save_node_settings
 from node_cli.utils.texts import safe_load_texts
-from skale.core.settings import get_settings
+from skale_core.settings import get_settings
 
 logger = logging.getLogger(__name__)
 TEXTS = safe_load_texts()
diff --git a/node_cli/fair/record/chain_record.py b/node_cli/fair/record/chain_record.py
@@ -22,7 +22,7 @@
 from typing import cast
 from datetime import datetime
 
-from skale.core.types import EnvType
+from skale_core.types import EnvType
 
 from node_cli.core.static_config import get_fair_chain_name
 from node_cli.fair.record.redis_record import FlatRedisRecord, FieldInfo
diff --git a/node_cli/operations/base.py b/node_cli/operations/base.py
@@ -24,7 +24,7 @@
 
 import distro
 
-from skale.core.settings import BaseNodeSettings, SkalePassiveSettings, SkaleSettings, get_settings
+from skale_core.settings import BaseNodeSettings, SkalePassiveSettings, SkaleSettings, get_settings
 
 from node_cli.cli.info import TYPE, VERSION
 from node_cli.configs import (
diff --git a/node_cli/operations/fair.py b/node_cli/operations/fair.py
@@ -23,8 +23,8 @@
 
 import distro
 
-from skale.core.settings import BaseNodeSettings, FairBaseSettings, FairSettings, get_settings
-from skale.core.types import EnvType
+from skale_core.settings import BaseNodeSettings, FairBaseSettings, FairSettings, get_settings
+from skale_core.types import EnvType
 
 from node_cli.cli.info import TYPE, VERSION
 from node_cli.configs import (
diff --git a/node_cli/utils/docker_utils.py b/node_cli/utils/docker_utils.py
@@ -29,7 +29,7 @@
 from docker.errors import NotFound
 from docker.models.containers import Container
 
-from skale.core.settings import BaseNodeSettings
+from skale_core.settings import BaseNodeSettings
 
 from node_cli.configs import (
     COMPOSE_PATH,
diff --git a/node_cli/utils/settings.py b/node_cli/utils/settings.py
@@ -21,7 +21,7 @@
 
 from dotenv.main import DotEnv
 
-from skale.core.settings import (
+from skale_core.settings import (
     SETTINGS_MAP,
     BaseNodeSettings,
     FairBaseSettings,
diff --git a/pyproject.toml b/pyproject.toml
@@ -45,7 +45,7 @@ dependencies = [
   "requests-mock==1.12.1",
   "redis==7.1.1",
   "PyInstaller==6.18.0",
-  "skale.py==7.12dev2",
+  "skale.py-core==7.13.dev1",
 ]
 
 [project.urls]
diff --git a/tests/cli/fair_cli_test.py b/tests/cli/fair_cli_test.py
@@ -137,5 +137,5 @@ def test_cleanup_node(mocked_g_config, inited_node):
         result = run_command(cleanup_node, ['--yes'])
         assert result.exit_code == 0
         cleanup_mock.assert_called_once_with(
-            node_mode=NodeMode.ACTIVE, prune=False, env={'SCHAIN_NAME': 'test'}
+            node_mode=NodeMode.ACTIVE, prune=False, compose_env={'SCHAIN_NAME': 'test'}
         )
diff --git a/tests/cli/node_test.py b/tests/cli/node_test.py
@@ -347,7 +347,6 @@ def test_restore(request, node_type, node_mode, test_user_conf, mocked_g_config,
             return_value=CliMeta(version='2.4.0', config_stream='3.0.2'),
         ),
         patch('node_cli.operations.base.configure_nftables'),
-        patch('node_cli.configs.user.validate_alias_or_address'),
     ):
         user_conf_path = request.getfixturevalue(test_user_conf).as_posix()
         result = run_command(restore_node, [backup_path, user_conf_path])
@@ -389,10 +388,8 @@ def test_turn_off_maintenance_on(mocked_g_config, regular_user_conf, active_node
     resp_mock = response_mock(requests.codes.ok, {'status': 'ok', 'payload': None})
     with (
         mock.patch('subprocess.run', new=subprocess_run_mock),
-        mock.patch('node_cli.core.node.SKALE_DIR_ENV_FILEPATH', regular_user_conf.as_posix()),
         mock.patch('node_cli.core.node.turn_off_op'),
         mock.patch('node_cli.utils.decorators.is_node_inited', return_value=True),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
         mock.patch('node_cli.cli.node.TYPE', NodeType.SKALE),
     ):
         result = run_command_mock(
@@ -425,7 +422,6 @@ def test_turn_on_maintenance_off(mocked_g_config, regular_user_conf, active_node
         mock.patch('node_cli.core.node.turn_on_op'),
         mock.patch('node_cli.core.node.is_base_containers_alive'),
         mock.patch('node_cli.utils.decorators.is_node_inited', return_value=True),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
         mock.patch('node_cli.cli.node.TYPE', NodeType.SKALE),
     ):
         result = run_command_mock(
@@ -493,4 +489,4 @@ def test_cleanup_node(mocked_g_config):
     ):
         result = run_command(cleanup_node, ['--yes'])
         assert result.exit_code == 0
-        cleanup_mock.assert_called_once_with(node_mode=NodeMode.ACTIVE, prune=False, env={})
+        cleanup_mock.assert_called_once_with(node_mode=NodeMode.ACTIVE, prune=False, compose_env={})
diff --git a/tests/cli/passive_node_test.py b/tests/cli/passive_node_test.py
@@ -45,7 +45,6 @@ def test_init_passive(mocked_g_config, clean_node_options, passive_user_conf):
         mock.patch('node_cli.core.resources.get_disk_size', return_value=BIG_DISK_SIZE),
         mock.patch('node_cli.operations.base.configure_nftables'),
         mock.patch('node_cli.utils.decorators.is_node_inited', return_value=False),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
     ):
         result = run_command(_init_passive, [passive_user_conf.as_posix()])
 
@@ -77,7 +76,6 @@ def test_init_passive_archive(mocked_g_config, clean_node_options, passive_user_
         mock.patch('node_cli.core.resources.get_disk_size', return_value=BIG_DISK_SIZE),
         mock.patch('node_cli.operations.base.configure_nftables'),
         mock.patch('node_cli.utils.decorators.is_node_inited', return_value=False),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
         mock.patch('node_cli.cli.node.TYPE', NodeType.SKALE),
     ):
         result = run_command(_init_passive, [passive_user_conf.as_posix(), '--archive'])
@@ -121,7 +119,6 @@ def test_update_passive(passive_user_conf, mocked_g_config):
             'node_cli.core.node.CliMetaManager.get_meta_info',
             return_value=CliMeta(version='2.6.0', config_stream='3.0.2'),
         ),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
     ):
         result = run_command(_update_passive, [passive_user_conf.as_posix(), '--yes'])
         assert result.exit_code == 0
@@ -146,4 +143,5 @@ def test_cleanup_node(mocked_g_config):
         result = run_command(cleanup_node, ['--yes'])
         assert result.exit_code == 0
         cleanup_mock.assert_called_once_with(
-            node_mode=NodeMode.PASSIVE, prune=False, env={'SCHAIN_NAME': 'test'})
+            node_mode=NodeMode.PASSIVE, prune=False, compose_env={'SCHAIN_NAME': 'test'}
+        )
diff --git a/tests/core/core_node_test.py b/tests/core/core_node_test.py
@@ -14,7 +14,6 @@
     NODE_DATA_PATH,
     SCHAINS_MNT_DIR_REGULAR,
     SCHAINS_MNT_DIR_SINGLE_CHAIN,
-    SKALE_DIR,
 )
 from node_cli.configs.resource_allocation import RESOURCE_ALLOCATION_FILEPATH
 
@@ -38,8 +37,6 @@
 ALPINE_IMAGE_NAME = 'alpine:3.12'
 CMD = 'sleep 60'
 
-SKALE_DIR_ENV_FILEPATH = os.path.join(SKALE_DIR, '.env')
-
 WRONG_CONTAINERS = [
     'WRONG_CONTAINER_1',
     'skale_WRONG_CONTAINER_4',
@@ -283,9 +280,8 @@ def test_init_node(regular_user_conf, no_resource_file):  # todo: write new init
         mock.patch('node_cli.core.node.init_op'),
         mock.patch('node_cli.core.node.is_base_containers_alive', return_value=True),
         mock.patch('node_cli.utils.helper.post_request', resp_mock),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
     ):
-        init(env_filepath=regular_user_conf.as_posix(), node_type=NodeType.SKALE)
+        init(config_file=regular_user_conf.as_posix(), node_type=NodeType.SKALE)
         assert os.path.isfile(RESOURCE_ALLOCATION_FILEPATH)
 
 
@@ -295,7 +291,6 @@ def test_update_node(regular_user_conf, mocked_g_config, resource_file, inited_n
     with (
         mock.patch('subprocess.run', new=subprocess_run_mock),
         mock.patch('node_cli.core.node.update_op'),
-        mock.patch('node_cli.core.node.save_env_params'),
         mock.patch('node_cli.operations.base.configure_nftables'),
         mock.patch('node_cli.core.host.prepare_host'),
         mock.patch('node_cli.core.node.is_base_containers_alive', return_value=True),
@@ -306,7 +301,6 @@ def test_update_node(regular_user_conf, mocked_g_config, resource_file, inited_n
             'node_cli.core.node.CliMetaManager.get_meta_info',
             return_value=CliMeta(version='2.6.0', config_stream='3.0.2'),
         ),
-        mock.patch('node_cli.configs.user.validate_alias_or_address'),
     ):
         with mock.patch(
             'node_cli.utils.helper.requests.get', return_value=safe_update_api_response()
@@ -428,13 +422,7 @@ def test_cleanup_success(
 
     cleanup(node_mode=NodeMode.ACTIVE)
 
-    mock_compose_env.assert_called_once_with(
-        SKALE_DIR_ENV_FILEPATH,
-        save=False,
-        node_type=NodeType.SKALE,
-        node_mode=NodeMode.ACTIVE,
-        skip_user_conf_validation=True,
-    )
+    mock_compose_env.assert_called_once_with(NodeType.SKALE, NodeMode.ACTIVE)
     mock_cleanup_skale_op.assert_called_once_with(
-        node_mode=NodeMode.ACTIVE, env=mock_env, prune=False
+        node_mode=NodeMode.ACTIVE, compose_env=mock_env, prune=False
     )
diff --git a/tests/fair/fair_node_test.py b/tests/fair/fair_node_test.py
diff --git a/tests/fixtures/settings.py b/tests/fixtures/settings.py

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`)`
`29`	`29`	`from node_cli.utils.node_type import NodeType`
`30`	`30`
`31`		`-from skale.core.types import EnvType`
	`31`	`+from skale_core.types import EnvType`
`32`	`32`
`33`	`33`
`34`	`34`	`def get_static_params(`