fix: participant redefining global flag (#573)

ethpandaops · Apr 23, 2024 · 9139f4b · 9139f4b
1 parent f7887aa
commit 9139f4b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -401,16 +401,16 @@ participants:
   count: 1
 
   # Snooper can be enabled with the `snooper_enabled` flag per client or globally
-  # Defaults to false
-  snooper_enabled: false
+  # Defaults null and then set to global snooper default (false)
+  snooper_enabled: null
 
   # Enables Ethereum Metrics Exporter for this participant. Can be set globally.
-  # Defaults to false
-  ethereum_metrics_exporter_enabled: false
+  # Defaults null and then set to global ethereum_metrics_exporter_enabled (false)
+  ethereum_metrics_exporter_enabled: null
 
   # Enables Xatu Sentry for this participant. Can be set globally.
-  # Defaults to false
-  xatu_sentry_enabled: false
+  # Defaults null and then set to global xatu_sentry_enabled (false)
+  xatu_sentry_enabled: null
 
   # Prometheus additional configuration for a given participant prometheus target.
   # Execution, beacon and validator client targets on prometheus will include this
@@ -443,8 +443,8 @@ participants:
 
   # Participant flag for keymanager api
   # This will open up http ports to your validator services!
-  # Defaults to false
-  keymanager_enabled: false
+  # Defaults null and then set to default global keymanager_enabled (false)
+  keymanager_enabled: null
 
 # Default configuration parameters for the network
 network_params:

diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star
@@ -425,53 +425,40 @@ def parse_network_params(input_args):
             participant["vc_image"] = default_image
 
         snooper_enabled = participant["snooper_enabled"]
-        if snooper_enabled == False:
-            default_snooper_enabled = result["snooper_enabled"]
-            if default_snooper_enabled:
-                participant["snooper_enabled"] = default_snooper_enabled
+        if snooper_enabled == None:
+            participant["snooper_enabled"] = result["snooper_enabled"]
 
         keymanager_enabled = participant["keymanager_enabled"]
-        if keymanager_enabled == False:
-            default_keymanager_enabled = result["keymanager_enabled"]
-            if default_keymanager_enabled:
-                participant["keymanager_enabled"] = default_keymanager_enabled
+        if keymanager_enabled == None:
+            participant["keymanager_enabled"] = result["keymanager_enabled"]
 
         ethereum_metrics_exporter_enabled = participant[
             "ethereum_metrics_exporter_enabled"
         ]
+        if ethereum_metrics_exporter_enabled == None:
+            participant["ethereum_metrics_exporter_enabled"] = result[
+                "ethereum_metrics_exporter_enabled"
+            ]
 
         xatu_sentry_enabled = participant["xatu_sentry_enabled"]
+        if xatu_sentry_enabled == None:
+            participant["xatu_sentry_enabled"] = result["xatu_sentry_enabled"]
 
         blobber_enabled = participant["blobber_enabled"]
         if blobber_enabled:
             # unless we are running lighthouse, we don't support blobber
-            if participant["cl_type"] != "lighthouse":
+            if participant["cl_type"] != constants.CL_TYPE.lighthouse:
                 fail(
                     "blobber is not supported for {0} client".format(
                         participant["cl_type"]
                     )
                 )
 
-        if ethereum_metrics_exporter_enabled == False:
-            default_ethereum_metrics_exporter_enabled = result[
-                "ethereum_metrics_exporter_enabled"
-            ]
-            if default_ethereum_metrics_exporter_enabled:
-                participant[
-                    "ethereum_metrics_exporter_enabled"
-                ] = default_ethereum_metrics_exporter_enabled
-
-        if xatu_sentry_enabled == False:
-            default_xatu_sentry_enabled = result["xatu_sentry_enabled"]
-            if default_xatu_sentry_enabled:
-                participant["xatu_sentry_enabled"] = default_xatu_sentry_enabled
-
         validator_count = participant["validator_count"]
         if validator_count == None:
-            default_validator_count = result["network_params"][
+            participant["validator_count"] = result["network_params"][
                 "num_validator_keys_per_node"
             ]
-            participant["validator_count"] = default_validator_count
 
         actual_num_validators += participant["validator_count"]
 
@@ -692,17 +679,17 @@ def default_participant():
         "node_selectors": {},
         "tolerations": [],
         "count": 1,
-        "snooper_enabled": False,
-        "ethereum_metrics_exporter_enabled": False,
-        "xatu_sentry_enabled": False,
+        "snooper_enabled": None,
+        "ethereum_metrics_exporter_enabled": None,
+        "xatu_sentry_enabled": None,
         "prometheus_config": {
             "scrape_interval": "15s",
             "labels": None,
         },
         "blobber_enabled": False,
         "blobber_extra_params": [],
         "builder_network_params": None,
-        "keymanager_enabled": False,
+        "keymanager_enabled": None,
     }