chore: use plan.store_service_files

0xPolygon · Mar 25, 2024 · d51cd7e · d51cd7e
1 parent 95359a0
commit d51cd7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 42 deletions.
diff --git a/lib/service.star b/lib/service.star
@@ -1,13 +1,3 @@
-# Read and retrieve the content of a file, within a service.
-# Note: It automatically removes newline characters.
-def read_file_from_service(plan, service_name, filename):
-    exec_recipe = ExecRecipe(
-        command=["/bin/sh", "-c", "cat {} | tr -d '\n'".format(filename)]
-    )
-    result = plan.exec(service_name=service_name, recipe=exec_recipe)
-    return result["output"]
-
-
 # Extract a specific key from a JSON file, within a service, using jq.
 def extract_json_key_from_service(plan, service_name, filename, key):
     plan.print("Extracting contract addresses and ports...")

diff --git a/main.star b/main.star
@@ -182,46 +182,22 @@ def run(plan, args):
         )
         zkevm_prover_package.start_prover(plan, args, prover_config_artifact)
 
-        # Fetch genesis and keystores.
-        genesis_file = service_package.read_file_from_service(
-            plan,
-            service_name="contracts" + args["deployment_suffix"],
-            filename="/opt/zkevm/genesis.json",
-        )
-        genesis_artifact = plan.render_templates(
+        # Start the zkevm node components
+        genesis_artifact = plan.store_service_files(
             name="genesis",
-            config={"genesis.json": struct(template=genesis_file, data={})},
-        )
-
-        sequencer_keystore_file = service_package.read_file_from_service(
-            plan,
             service_name="contracts" + args["deployment_suffix"],
-            filename="/opt/zkevm/sequencer.keystore",
+            src="/opt/zkevm/genesis.json",
         )
-        sequencer_keystore_artifact = plan.render_templates(
+        sequencer_keystore_artifact = plan.store_service_files(
             name="sequencer-keystore",
-            config={
-                "sequencer.keystore": struct(
-                    template=sequencer_keystore_artifact, data={}
-                )
-            },
-        )
-
-        aggregator_keystore_file = service_package.read_file_from_service(
-            plan,
             service_name="contracts" + args["deployment_suffix"],
-            filename="/opt/zkevm/aggregator.keystore",
+            src="/opt/zkevm/sequencer.keystore",
         )
-        aggregator_keystore_artifact = plan.render_templates(
+        aggregator_keystore_artifact = plan.store_service_files(
             name="aggregator-keystore",
-            config={
-                "aggregator.keystore": struct(
-                    template=aggregator_keystore_file, data={}
-                )
-            },
+            service_name="contracts" + args["deployment_suffix"],
+            src="/opt/zkevm/aggregator.keystore",
         )
-
-        # Start the zkevm node components
         start_node_components(
             plan,
             args,