refactor enable tha

Author: yungwine

mytoncore/mytoncore.py

@@ -33,8 +33,6 @@
 	Dict, int2ip
 )
 
-from mytoninstaller.utils import enable_tha
-
 
 class MyTonCore():
 	def __init__(self, local):
@@ -3081,7 +3079,8 @@ def check_enable_mode(self, name):
 				raise Exception(f'Cannot enable validator mode while liteserver mode is enabled. '
 								f'Use `disable_mode liteserver` first.')
 		if name == 'liquid-staking':
-			enable_tha(self.local)
+			from mytoninstaller.settings import enable_ton_http_api
+			enable_ton_http_api(self.local)
 
 	def enable_mode(self, name):
 		if name not in MODES:

mytoninstaller/settings.py

@@ -485,17 +485,36 @@ def EnableJsonRpc(local):
 	color_print(text)
 #end define
 
+def tha_exists():
+	try:
+		resp = requests.get('http://127.0.0.1:8801/healthcheck', timeout=3)
+	except:
+		return False
+	if resp.status_code == 200 and resp.text == '"OK"':
+		return True
+	return False
+#end define
+
 def enable_ton_http_api(local):
-	local.add_log("start EnableTonHttpApi function", "debug")
+	try:
+		if not tha_exists():
+			enable_ton_http_api(local)
+	except Exception as e:
+		local.add_log(f"Error in enable_ton_http_api: {e}", "warning")
+		pass
+#end define
+
+def do_enable_ton_http_api(local):
+	local.add_log("start do_enable_ton_http_api function", "debug")
 	if not os.path.exists('/usr/bin/ton/local.config.json'):
 		from mytoninstaller.mytoninstaller import CreateLocalConfigFile
 		CreateLocalConfigFile(local, [])
 	ton_http_api_installer_path = pkg_resources.resource_filename('mytoninstaller.scripts', 'ton_http_api_installer.sh')
 	exit_code = run_as_root(["bash", ton_http_api_installer_path])
 	if exit_code == 0:
-		text = "EnableTonHttpApi - {green}OK{endc}"
+		text = "do_enable_ton_http_api - {green}OK{endc}"
 	else:
-		text = "EnableTonHttpApi - {red}Error{endc}"
+		text = "do_enable_ton_http_api - {red}Error{endc}"
 	color_print(text)
 #end define
 

mytoninstaller/utils.py

@@ -2,8 +2,6 @@
 import json
 import time
 import subprocess
-
-import requests
 from nacl.signing import SigningKey
 
 
@@ -52,25 +50,3 @@ def get_ed25519_pubkey(privkey):
 	pubkey = privkey_obj.verify_key.encode()
 	return pubkey
 #end define
-
-
-def tha_exists():
-	try:
-		resp = requests.get('http://127.0.0.1:8801/healthcheck', timeout=3)
-	except:
-		return False
-	if resp.status_code == 200 and resp.text == '"OK"':
-		return True
-	return False
-
-
-def enable_tha(local):
-	try:
-		if not tha_exists():
-			local.add_log("Enabling TON HTTP API", "debug")
-			from mytoninstaller.settings import enable_ton_http_api
-			enable_ton_http_api(local)
-			local.add_log("Enabled TON HTTP API", "debug")
-	except Exception as e:
-		local.add_log(f"Error in enable_tha: {e}", "warning")
-		pass