upd min required clang version

Author: yungwine

mytonctrl/mytonctrl.py

@@ -50,6 +50,9 @@
 from mytoninstaller.utils import get_ton_storage_port
 
 
+CLANG_VERSION_REQUIRED = 21
+
+
 def Init(local, ton, console, argv):
 	# Load translate table
 	with get_package_resource_path('mytonctrl', 'resources/translate.json') as translate_path:
@@ -370,8 +373,8 @@ def Upgrade(local, ton, args: list):
 	ton.SetSettings("validatorConsole", validatorConsole)
 
 	clang_version = get_clang_major_version()
-	if clang_version is None or clang_version < 16:
-		text = f"{{red}}WARNING: THIS UPGRADE WILL MOST PROBABLY FAIL DUE TO A WRONG CLANG VERSION: {clang_version}, REQUIRED VERSION IS 16. RECOMMENDED TO EXIT NOW AND UPGRADE CLANG AS PER INSTRUCTIONS: https://gist.github.com/neodix42/e4b1b68d2d5dd3dec75b5221657f05d7{{endc}}\n"
+	if clang_version is None or clang_version < CLANG_VERSION_REQUIRED:
+		text = f"{{red}}WARNING: THIS UPGRADE WILL MOST PROBABLY FAIL DUE TO A WRONG CLANG VERSION: {clang_version}, REQUIRED VERSION IS {CLANG_VERSION_REQUIRED}. RECOMMENDED TO EXIT NOW AND UPGRADE CLANG AS PER INSTRUCTIONS: https://gist.github.com/neodix42/24d6a401e928f7e895fcc8e7b7c5c24a{{endc}}\n"
 		color_print(text)
 		if input("Continue with upgrade anyway? [Y/n]\n").strip().lower() not in ('y', ''):
 			print('aborted.')

tests/integration/test_basic_commands.py

@@ -72,7 +72,7 @@ def fake_run_as_root(run_args):
         return 0
 
     monkeypatch.setattr(mytonctrl_module, "run_as_root", fake_run_as_root)
-    monkeypatch.setattr(mytonctrl_module, "get_clang_major_version", lambda: 16)
+    monkeypatch.setattr(mytonctrl_module, "get_clang_major_version", lambda: 21)
     monkeypatch.setattr(MyTonCore, "using_validator", lambda self: False)
     with get_package_resource_path('mytonctrl', 'scripts/upgrade.sh') as upg_path:
         assert upg_path.is_file()
@@ -98,15 +98,15 @@ def fake_SetSettings(self, name, value):
     assert captured_settings["liteClient"]["liteServer"]["pubkeyPath"] == "/var/ton-work/keys/liteserver.pub"
     assert calls["run_args"] == ["bash", upg_path, "-a", "author", "-r", "repo", "-b", "branch"]
 
-    # clang version is < 16, abort
+    # clang version is < 21, abort
     calls = {}
     monkeypatch.setattr(mytonctrl_module, "get_clang_major_version", lambda: 14)
     monkeypatch.setattr('builtins.input', lambda _: "n")
     output = cli.execute("upgrade")
     assert "aborted." in output
     assert not calls
 
-    # clang version is < 16, proceed
+    # clang version is < 21, proceed
     monkeypatch.setattr(mytonctrl_module, "get_clang_major_version", lambda: 14)
     monkeypatch.setattr('builtins.input', lambda _: "y")
     output = cli.execute("upgrade")
@@ -115,7 +115,7 @@ def fake_SetSettings(self, name, value):
     assert calls["run_args"] == ["bash", upg_path, "-a", "author", "-r", "repo", "-b", "branch"]
 
     # call upgrade_btc_teleport if using validator
-    monkeypatch.setattr(mytonctrl_module, "get_clang_major_version", lambda: 16)
+    monkeypatch.setattr(mytonctrl_module, "get_clang_major_version", lambda: 21)
     calls = {}
     monkeypatch.setattr(MyTonCore, "using_validator", lambda self: True)
     teleport_calls = {}