fix up all tests not to re-define ethereum package

ethpandaops · Jul 5, 2024 · 9cfb9bd · 9cfb9bd
1 parent 95608ed
commit 9cfb9bd
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 76 deletions.
diff --git a/.github/tests/blockscout.yaml b/.github/tests/blockscout.yaml
@@ -13,11 +13,3 @@ optimism_package:
       network_id: '3151910'
     additional_services:
       - blockscout
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - blockscout
diff --git a/.github/tests/multiple_l2s.yaml b/.github/tests/multiple_l2s.yaml
@@ -1,21 +1,7 @@
 optimism_package:
-  - participants:
-      - el_type: op-geth
     network_params:
       name: op-rollup-one
       network_id: '3151909'
-    additional_services: []
-  - participants:
-      - el_type: op-geth
     network_params:
       name: op-rollup-two
       network_id: '3151910'
-    additional_services: []
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/.github/tests/op-erigon.yaml b/.github/tests/op-erigon.yaml
@@ -2,11 +2,3 @@ optimism_package:
   participants:
     - el_type: op-erigon
       cl_type: op-node
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/.github/tests/op-geth.yaml b/.github/tests/op-geth.yaml
@@ -2,11 +2,3 @@ optimism_package:
   participants:
     - el_type: op-geth
       cl_type: op-node
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/.github/tests/op-nethermind.yaml b/.github/tests/op-nethermind.yaml
@@ -3,11 +3,3 @@ optimism_package:
     - el_type: op-geth
     - el_type: op-nethermind
       cl_type: op-node
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: nethermind
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/.github/tests/op-node.yaml b/.github/tests/op-node.yaml
@@ -8,11 +8,3 @@ optimism_package:
       cl_type: op-node
     - el_type: op-nethermind
       cl_type: op-node
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/.github/tests/op-reth.yaml b/.github/tests/op-reth.yaml
@@ -2,11 +2,3 @@ optimism_package:
   participants:
     - el_type: op-reth
       cl_type: op-node
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/.github/tests/single_l2.yaml b/.github/tests/single_l2.yaml
@@ -1,11 +1,3 @@
 optimism_package:
   participants:
     - count: 2
-ethereum_package:
-  participants:
-    - el_type: geth
-    - el_type: reth
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora
diff --git a/main.star b/main.star
@@ -16,7 +16,10 @@ def run(plan, args):
         A full deployment of Optimism L2(s)
     """
     plan.print("Parsing the L1 input args")
-    ethereum_args = args.get("ethereum_package", {})
+    # If no args are provided, use the default values with minimal preset
+    ethereum_args = args.get(
+        "ethereum_package", {"network_params": {"preset": "minimal"}}
+    )
     optimism_args = args.get("optimism_package", {})
     # Deploy the L1
     plan.print("Deploying a local L1")

diff --git a/network_params.yaml b/network_params.yaml
@@ -6,8 +6,3 @@ optimism_package:
     - el_type: op-nethermind
   additional_services:
     - blockscout
-ethereum_package:
-  network_params:
-    preset: minimal
-  additional_services:
-    - dora