Fix linter

Author: badrogger

tests/cli/node_test.py

@@ -17,34 +17,32 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import logging
 import pathlib
-import mock
 from unittest.mock import MagicMock, patch
 
-import requests
-import logging
+import mock
 import pytest
+import requests
 
-from node_cli.utils.node_type import NodeType
-
-from node_cli.configs import INIT_ENV_FILEPATH, SKALE_DIR, G_CONF_HOME
 from node_cli.cli.node import (
+    _set_domain_name,
+    _turn_off,
+    _turn_on,
+    backup_node,
     node_info,
     register_node,
-    signature,
-    backup_node,
+    remove_node_from_maintenance,
     restore_node,
     set_node_in_maintenance,
-    remove_node_from_maintenance,
+    signature,
     version,
-    _turn_off,
-    _turn_on,
-    _set_domain_name,
 )
+from node_cli.configs import G_CONF_HOME, SKALE_DIR
 from node_cli.utils.exit_codes import CLIExitCodes
 from node_cli.utils.helper import init_default_logger
 from node_cli.utils.meta import CliMeta
-
+from node_cli.utils.node_type import NodeType
 from tests.helper import (
     response_mock,
     run_command,

tests/configs/configs_env_validate_test.py

@@ -1,17 +1,16 @@
 import os
 from typing import Optional
 
-import mock
 import pytest
 import requests
 
 from node_cli.configs.alias_address_validation import (
     ContractType,
     get_chain_id,
     get_network_metadata,
+    validate_alias_or_address,
     validate_contract_address,
     validate_contract_alias,
-    validate_alias_or_address,
 )
 from node_cli.configs.user import (
     ALLOWED_ENV_TYPES,

tests/core/core_node_test.py

@@ -11,19 +11,17 @@
 
 from node_cli.configs import NODE_DATA_PATH, SCHAINS_MNT_DIR_REGULAR, SCHAINS_MNT_DIR_SINGLE_CHAIN
 from node_cli.configs.resource_allocation import RESOURCE_ALLOCATION_FILEPATH
-from node_cli.configs.user import SkaleUserConfig
 from node_cli.core.node import (
+    compose_node_env,
     get_expected_container_names,
-    is_base_containers_alive,
     init,
+    is_base_containers_alive,
+    is_update_safe,
     pack_dir,
     update,
-    is_update_safe,
-    compose_node_env,
 )
 from node_cli.utils.meta import CliMeta
 from node_cli.utils.node_type import NodeType
-
 from tests.helper import response_mock, safe_update_api_response, subprocess_run_mock
 from tests.resources_test import BIG_DISK_SIZE
 
@@ -154,11 +152,56 @@ def test_is_base_containers_alive_empty(node_type, is_boot):
         'expect_flask_key, expect_backup_run'
     ),
     [
-        (NodeType.REGULAR, 'regular_user_conf', False, True, False, SCHAINS_MNT_DIR_REGULAR, True, False),
-        (NodeType.REGULAR, 'regular_user_conf', False, True, True, SCHAINS_MNT_DIR_REGULAR, True, True),
-        (NodeType.SYNC, 'sync_user_conf', False, False, False, SCHAINS_MNT_DIR_SINGLE_CHAIN, False, False),
-        (NodeType.MIRAGE, 'mirage_boot_user_conf', True, True, False, SCHAINS_MNT_DIR_SINGLE_CHAIN, True, False),
-        (NodeType.MIRAGE, 'mirage_user_conf', False, True, False, SCHAINS_MNT_DIR_SINGLE_CHAIN, True, False),
+        (
+            NodeType.REGULAR,
+            'regular_user_conf',
+            False,
+            True,
+            False,
+            SCHAINS_MNT_DIR_REGULAR,
+            True,
+            False,
+        ),
+        (
+            NodeType.REGULAR,
+            'regular_user_conf',
+            False,
+            True,
+            True,
+            SCHAINS_MNT_DIR_REGULAR,
+            True,
+            True,
+        ),
+        (
+            NodeType.SYNC,
+            'sync_user_conf',
+            False,
+            False,
+            False,
+            SCHAINS_MNT_DIR_SINGLE_CHAIN,
+            False,
+            False,
+        ),
+        (
+            NodeType.MIRAGE,
+            'mirage_boot_user_conf',
+            True,
+            True,
+            False,
+            SCHAINS_MNT_DIR_SINGLE_CHAIN,
+            True,
+            False,
+        ),
+        (
+            NodeType.MIRAGE,
+            'mirage_user_conf',
+            False,
+            True,
+            False,
+            SCHAINS_MNT_DIR_SINGLE_CHAIN,
+            True,
+            False,
+        ),
     ],
     ids=[
         'regular',
@@ -188,7 +231,7 @@ def test_compose_node_env(
     with (
         mock.patch('node_cli.configs.user.validate_alias_or_address'),
         mock.patch('node_cli.core.node.save_env_params'),
-        mock.patch('node_cli.core.node.get_flask_secret_key', return_value='mock_secret')
+        mock.patch('node_cli.core.node.get_flask_secret_key', return_value='mock_secret'),
     ):
         result_env = compose_node_env(
             env_filepath=user_config_path.as_posix(),
@@ -274,6 +317,7 @@ def resource_file():
         if os.path.exists(RESOURCE_ALLOCATION_FILEPATH):
             os.remove(RESOURCE_ALLOCATION_FILEPATH)
 
+
 def test_init_node(regular_user_conf, no_resource_file):  # todo: write new init node test
     resp_mock = response_mock(requests.codes.created)
     assert not os.path.isfile(RESOURCE_ALLOCATION_FILEPATH)
@@ -318,7 +362,7 @@ def test_update_node(regular_user_conf, mocked_g_config, resource_file, inited_n
             result = update(
                 regular_user_conf.as_posix(),
                 pull_config_for_schain=None,
-                node_type=NodeType.REGULAR
+                node_type=NodeType.REGULAR,
             )
             assert result is None