Merge pull request #504 from yungwine/lint

add ruff check for the whole project

Author: yungwine

.github/workflows/tests.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Run Ruff
         run: |
-          ruff check mytonctrl  # wip adding ruff linting across the whole project
+          ruff check
 
       - name: Build project
         run: |

modules/__init__.py

@@ -3,7 +3,6 @@
 
 from modules.collator import CollatorModule
 from modules.module import MtcModule
-from modules.pool import PoolModule
 from modules.nominator_pool import NominatorPoolModule
 from modules.single_pool import SingleNominatorModule
 from modules.validator import ValidatorModule

modules/alert_bot.py

@@ -4,7 +4,7 @@
 
 from modules.module import MtcModule
 from mypylib.mypylib import get_timestamp, print_table, color_print
-from mytoncore import get_hostname, signed_int_to_hex64
+from mytoncore.utils import get_hostname, signed_int_to_hex64
 from mytonctrl.console_cmd import add_command, check_usage_one_arg, check_usage_two_args
 from mytonctrl.utils import timestamp2utcdatetime
 
@@ -374,7 +374,7 @@ def setup_alert_bot(self, args):
             color_print("setup_alert_bot - {green}OK{endc}")
         except Exception as e:
             self.local.add_log(f"Error while sending welcome message: {e}", "error")
-            self.local.add_log(f"If you want the bot to write to a multi-person chat group, make sure the bot is added to that chat group. If it is not - do it and run the command `setup_alert_bot <bot_token> <chat_id>` again.", "info")
+            self.local.add_log("If you want the bot to write to a multi-person chat group, make sure the bot is added to that chat group. If it is not - do it and run the command `setup_alert_bot <bot_token> <chat_id>` again.", "info")
             color_print("setup_alert_bot - {red}Error{endc}")
 
     def send_welcome_message(self):

modules/backups.py

@@ -2,11 +2,10 @@
 import shutil
 import subprocess
 import time
-import typing
 from typing import Optional
 
 from modules.module import MtcModule
-from mytonctrl.console_cmd import add_command, check_usage_two_args, check_usage_args_min_max_len
+from mytonctrl.console_cmd import add_command, check_usage_args_min_max_len
 from mypylib.mypylib import color_print, ip2int, run_as_root, parse
 from mytoncore.utils import get_package_resource_path
 from mytonctrl.utils import get_current_user, pop_user_from_args
@@ -69,7 +68,7 @@ def restore_backup(self, args):
         user = pop_user_from_args(args)
         if '-y' not in args:
             res = input(
-                f'This action will overwrite existing configuration with contents of backup archive, please make sure that donor node is not in operation prior to this action. Proceed [y/n]')
+                'This action will overwrite existing configuration with contents of backup archive, please make sure that donor node is not in operation prior to this action. Proceed [y/n]')
             if res.lower() != 'y':
                 print('aborted.')
                 return
@@ -81,8 +80,8 @@ def restore_backup(self, args):
             print('Before proceeding, mtc will create a backup of current configuration.')
             try:
                 self.create_backup([])
-            except:
-                color_print("{red}Could not create backup{endc}")
+            except Exception as e:
+                color_print(f"{{red}}Could not create backup: {e}{{endc}}")
 
         ip = str(ip2int(get_own_ip()))
         command_args = ["-m", self.ton.local.buffer.my_work_dir, "-n", args[0], "-i", ip]

modules/collator.py

@@ -1,9 +1,13 @@
 from modules.module import MtcModule
 from mypylib import color_print, print_table
-from mytoncore import b642hex, signed_int_to_hex64, shard_prefix_len, hex_shard_to_int, shard_prefix, shard_is_ancestor
+from mytoncore.utils import b642hex, signed_int_to_hex64, shard_prefix_len, hex_shard_to_int, shard_prefix, shard_is_ancestor
 from mytonctrl.console_cmd import check_usage_args_min_len, add_command, check_usage_no_args, check_usage_args_lens
 from mytonctrl.utils import pop_arg_from_args
 
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from mytoncore import MyTonCore
+
 
 class CollatorModule(MtcModule):
 
@@ -83,7 +87,7 @@ def stop_collator(self, args: list):
         if not check_usage_args_lens("stop_collator", args, [0, 2]):
             return
         if not args:
-            text = f"{{red}}WARNING: This action will stop and delete all local collation broadcasts from this node for all shards.{{endc}}\n"
+            text = "{red}WARNING: This action will stop and delete all local collation broadcasts from this node for all shards.{endc}\n"
             color_print(text)
             if input("Continue anyway? [Y/n]\n").strip().lower() not in ('y', ''):
                 print('aborted.')
@@ -134,7 +138,7 @@ def print_collators(self, args: list = None):
     def add_validator_to_collation_wl(self, args: list):
         if not check_usage_args_min_len("add_validator_to_collation_wl", args, 1):
             return
-        self.ton.validatorConsole.Run(f"collator-whitelist-enable 1")
+        self.ton.validatorConsole.Run("collator-whitelist-enable 1")
         self.local.add_log("Collation whitelist enabled")
         for adnl_addr in args:
             result = self.ton.validatorConsole.Run(f"collator-whitelist-add {adnl_addr}")
@@ -154,7 +158,7 @@ def delete_validator_from_collation_wl(self, args: list):
     def disable_collation_validator_wl(self, args: list):
         if not check_usage_no_args("disable_collation_wl", args):
             return
-        result = self.ton.validatorConsole.Run(f"collator-whitelist-enable 0")
+        result = self.ton.validatorConsole.Run("collator-whitelist-enable 0")
         if 'success' not in result:
             raise Exception(f'Failed to disable collation validator whitelist: {result}')
         color_print("disable_collation_validator_wl - {green}OK{endc}")
@@ -167,8 +171,8 @@ def print_collation_validators_whitelist(self, args: list = None):
     @classmethod
     def check_enable(cls, ton: "MyTonCore"):
         if ton.using_validator():
-            raise Exception(f'Cannot enable collator mode while validator mode is enabled. '
-                            f'Use `disable_mode validator` first.')
+            raise Exception('Cannot enable collator mode while validator mode is enabled. '
+                            'Use `disable_mode validator` first.')
 
     def check_disable(self):
         have_collators_text = 'has active collator working and ' if self.get_collators() else ''

modules/collator_config.py

@@ -36,12 +36,12 @@ def get_config(path):
         else:
             config = CollatorConfigModule.check_config_file(path)
         if config is None:
-            raise Exception(f'Failed to get config')
+            raise Exception('Failed to get config')
         return config
 
     def add_collator_config_to_vc(self, config: dict):
-        self.local.add_log(f"Adding collator options config to validator console", "debug")
-        path = self.ton.tempDir + f'/collator_config.json'
+        self.local.add_log("Adding collator options config to validator console", "debug")
+        path = self.ton.tempDir + '/collator_config.json'
         with open(path, 'w') as f:
             json.dump(config, f)
         result = self.ton.validatorConsole.Run(f"setcollatoroptionsjson {path}")
@@ -63,15 +63,15 @@ def set_collator_config(self, args):
     def get_collator_config(self, args):
         location = self.ton.get_collator_config_location()
         print(f'Collator config location: {location}')
-        path = self.ton.tempDir + f'/current_collator_config.json'
+        path = self.ton.tempDir + '/current_collator_config.json'
         output = self.ton.validatorConsole.Run(f'getcollatoroptionsjson {path}')
         if 'saved config to' not in output:
             print(f'Failed to get collator config: {output}')
             color_print("get_collator_config - {red}ERROR{endc}")
             return
         with open(path, 'r') as f:
             config = json.load(f)
-        print(f'Collator config:')
+        print('Collator config:')
         print(json.dumps(config, indent=4))
         color_print("get_collator_config - {green}OK{endc}")
 

modules/controller.py

@@ -8,6 +8,10 @@
 from mytonctrl.utils import GetItemFromList
 from modules.module import MtcModule
 
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from mytoncore import MyTonCore
+
 
 class ControllerModule(MtcModule):
 

modules/liteserver.py

@@ -1,8 +1,11 @@
-import psutil
-
 from modules.module import MtcModule
 
 
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from mytoncore import MyTonCore
+
+
 class LiteserverModule(MtcModule):
 
     description = 'For liteserver usage only without validator.'
@@ -11,8 +14,8 @@ class LiteserverModule(MtcModule):
     @classmethod
     def check_enable(cls, ton: "MyTonCore"):
         if ton.using_validator():
-            raise Exception(f'Cannot enable liteserver mode while validator mode is enabled. '
-                            f'Use `disable_mode validator` first.')
+            raise Exception('Cannot enable liteserver mode while validator mode is enabled. '
+                            'Use `disable_mode validator` first.')
 
     def add_console_commands(self, console):
         ...

modules/module.py

@@ -2,6 +2,10 @@
 
 from mypylib.mypylib import MyPyClass
 
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from mytoncore import MyTonCore
+
 
 class MtcModule(ABC):
 

modules/nominator_pool.py

@@ -88,7 +88,7 @@ def do_deposit_to_pool(self, pool_addr, amount):
         bocPath = self.ton.local.buffer.my_temp_dir + wallet.name + "validator-deposit-query.boc"
         fiftScript = self.ton.contractsDir + "nominator-pool/func/validator-deposit.fif"
         args = [fiftScript, bocPath]
-        result = self.ton.fift.Run(args)
+        self.ton.fift.Run(args)
         resultFilePath = self.ton.SignBocWithWallet(wallet, bocPath, pool_addr, amount)
         self.ton.SendFile(resultFilePath, wallet)