move events from mytoncore/functions.py

Author: yungwine

.github/workflows/tests.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Run Pyright
         run: |
           pip install pyright
-          pyright mypylib mypyconsole mytoncore/models.py mytoncore/utils.py  # wip support whole project
+          pyright mypylib mypyconsole mytoncore/models.py mytoncore/utils.py mytoncore/events.py # wip support whole project
 
       - name: Run pytest
         run: |

mypylib/mypylib.py

@@ -374,7 +374,7 @@ def check_root_permission(self):
 		return result
 	#end define
 
-	def add_log(self, input_text, mode=INFO):
+	def add_log(self, input_text: str, mode=INFO):
 		input_text = f"{input_text}"
 		time_text = date_time_library.datetime.utcnow().strftime("%d.%m.%Y, %H:%M:%S.%f")[:-3]
 		time_text = "{0} (UTC)".format(time_text).ljust(32, ' ')

mytoncore/__main__.py

@@ -1,5 +1,42 @@
-from mytoncore.functions import mytoncore
+import argparse
+from mypylib import MyPyClass
+from mytoncore.events import (
+    enable_vc_event,
+    enable_mode,
+    enable_btc_teleport,
+    setup_collator,
+)
+from mytoncore.functions import Init, General
 
 
-if __name__ == '__main__':
-    mytoncore()
+def run_event(local: MyPyClass, event_name: str):
+    if event_name == "enableVC":
+        enable_vc_event(local)
+    elif event_name.startswith("enable_mode"):
+        enable_mode(local, event_name)
+    elif event_name == "enable_btc_teleport":
+        enable_btc_teleport(local)
+    elif event_name.startswith("setup_collator"):
+        setup_collator(local, event_name)
+    else:
+        raise Exception("Unknown event name")
+    local.exit()
+
+
+if __name__ == "__main__":
+    l = MyPyClass("mytoncore.py")
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-e",
+        type=str,
+        metavar="EVENT",
+        help="event to run (enableVC, enable_mode*, enable_btc_teleport, setup_collator*)",
+    )
+    args = parser.parse_args()
+
+    if args.e is not None:
+        run_event(l, args.e)
+    else:
+        Init(l)
+        General(l)

mytoncore/events.py

@@ -0,0 +1,44 @@
+from mypylib import MyPyClass
+
+from mytoncore.mytoncore import MyTonCore
+
+
+def enable_vc_event(local: MyPyClass):
+    local.add_log("start EnableVcEvent function", "debug")
+    ton = MyTonCore(local)
+    wallet = ton.CreateWallet("validator_wallet_001", -1)
+    assert wallet is not None
+    local.db["validatorWalletName"] = wallet.name
+    adnl_addr = ton.CreateNewKey()
+    assert adnl_addr is not None
+    ton.AddAdnlAddrToValidator(adnl_addr)
+    local.db["adnlAddr"] = adnl_addr
+    local.save()
+
+
+def enable_mode(local: MyPyClass, event_name: str):
+    ton = MyTonCore(local)
+    mode = event_name.split("_")[-1]
+    if mode in ("liteserver", "collator"):
+        ton.disable_mode("validator")
+    ton.enable_mode(mode)
+
+
+def enable_btc_teleport(local: MyPyClass):
+    local.add_log("start enable_btc_teleport function", "debug")
+    ton = MyTonCore(local)
+    if not ton.using_validator():
+        local.add_log("Skip installing BTC Teleport as node is not a validator", "info")
+        return
+    from modules.btc_teleport import BtcTeleportModule
+
+    BtcTeleportModule(ton, local).init(reinstall=True)
+
+
+def setup_collator(local: MyPyClass, event_name: str):
+    local.add_log("start setup_collator function", "debug")
+    ton = MyTonCore(local)
+    from modules.collator import CollatorModule
+
+    shards = event_name.split("_")[2:]
+    CollatorModule(ton, local).setup_collator(shards)

mytoncore/functions.py

@@ -25,13 +25,6 @@
 
 
 def Init(local):
-    # Event reaction
-    if ("-e" in sys.argv):
-        x = sys.argv.index("-e")
-        event_name = sys.argv[x+1]
-        Event(local, event_name)
-    # end if
-
     local.run()
 
     # statistics
@@ -45,71 +38,6 @@ def Init(local):
     local.buffer.prevShardsBlock = dict()
     local.buffer.blocksNum = 0
     local.buffer.transNum = 0
-# end define
-
-
-def Event(local, event_name):
-    if event_name == "enableVC":
-        EnableVcEvent(local)
-    elif event_name == "validator down":
-        ValidatorDownEvent(local)
-    elif event_name.startswith("enable_mode"):
-        enable_mode(local, event_name)
-    elif event_name == "enable_btc_teleport":
-        enable_btc_teleport(local)
-    elif event_name.startswith("setup_collator"):
-        setup_collator(local, event_name)
-    local.exit()
-# end define
-
-
-def EnableVcEvent(local):
-    local.add_log("start EnableVcEvent function", "debug")
-    # Создать новый кошелек для валидатора
-    ton = MyTonCore(local)
-    wallet = ton.CreateWallet("validator_wallet_001", -1)
-    local.db["validatorWalletName"] = wallet.name
-
-    # Создать новый ADNL адрес для валидатора
-    adnlAddr = ton.CreateNewKey()
-    ton.AddAdnlAddrToValidator(adnlAddr)
-    local.db["adnlAddr"] = adnlAddr
-
-    # Сохранить
-    local.save()
-# end define
-
-
-def ValidatorDownEvent(local):
-    local.add_log("start ValidatorDownEvent function", "debug")
-    local.add_log("Validator is down", "error")
-# end define
-
-
-def enable_mode(local, event_name: str):
-    ton = MyTonCore(local)
-    mode = event_name.split("_")[-1]
-    if mode in ("liteserver", "collator"):
-        ton.disable_mode('validator')
-    ton.enable_mode(mode)
-#end define
-
-def enable_btc_teleport(local):
-    local.add_log("start enable_btc_teleport function", "debug")
-    ton = MyTonCore(local)
-    if not ton.using_validator():
-        local.add_log("Skip installing BTC Teleport as node is not a validator", "info")
-        return
-    from modules.btc_teleport import BtcTeleportModule
-    BtcTeleportModule(ton, local).init(reinstall=True)
-
-
-def setup_collator(local, event_name: str):
-    local.add_log("start setup_collator function", "debug")
-    ton = MyTonCore(local)
-    from modules.collator import CollatorModule
-    shards = event_name.split("_")[2:]
-    CollatorModule(ton, local).setup_collator(shards)
 
 
 def Elections(local, ton):

mytoncore/mytoncore.py

@@ -975,7 +975,7 @@ def AddKeyToTemp(self, key, endWorkTime):
 		return output
 	#end define
 
-	def AddAdnlAddrToValidator(self, adnlAddr):
+	def AddAdnlAddrToValidator(self, adnlAddr: str):
 		self.local.add_log("start AddAdnlAddrToValidator function", "debug")
 		output = False
 		result = self.validatorConsole.Run("addadnl {adnlAddr} 0".format(adnlAddr=adnlAddr))
@@ -1605,7 +1605,7 @@ def SaveElectionVarsToJsonFile(self, **kwargs):
 		file.close()
 	#ned define
 
-	def CreateWallet(self, name, workchain=0, version="v1", **kwargs):
+	def CreateWallet(self, name: str, workchain=0, version="v1", **kwargs):
 		self.local.add_log("start CreateWallet function", "debug")
 		subwallet_default = 698983191 + workchain # 0x29A9A317 + workchain
 		subwallet = kwargs.get("subwallet", subwallet_default)
@@ -3083,15 +3083,15 @@ def check_enable_mode(self, name):
 			from mytoninstaller.settings import enable_ton_http_api
 			enable_ton_http_api(self.local)
 
-	def enable_mode(self, name):
+	def enable_mode(self, name: str):
 		if name not in MODES:
 			raise Exception(f'Unknown module name: {name}. Available modes: {", ".join(MODES)}')
 		MODES[name].check_enable(self)
 		current_modes = self.get_modes()
 		current_modes[name] = True
 		self.local.save()
 
-	def disable_mode(self, name):
+	def disable_mode(self, name: str):
 		current_modes = self.get_modes()
 		if name not in current_modes:
 			raise Exception(f'Unknown module name: {name}. Available modes: {", ".join(MODES)}')

mytoninstaller/settings.py

@@ -99,7 +99,7 @@ def FirstNodeSettings(local):
 		for shard in add_shard.split():
 			cmd += f' --add-shard {shard}'
 
-	add2systemd(name="validator", user=vuser, start=cmd, pre='/bin/sleep 2') # post="/usr/bin/python3 /usr/src/mytonctrl/mytoncore.py -e \"validator down\""
+	add2systemd(name="validator", user=vuser, start=cmd, pre='/bin/sleep 2')
 
 	if local.buffer.public_ip is not None:
 		ip = local.buffer.public_ip