Commit f5595f4c authored by Gyanendra Mishra's avatar Gyanendra Mishra Committed by GitHub

fix: get rid of explorer type (#280)

parent 3f2c7979
...@@ -223,9 +223,12 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -223,9 +223,12 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"launch_additional_services": true, "launch_additional_services": true,
// By default includes // By default includes
// - A transaction spammer is launched to fake transactions sent to the network // - A transaction spammer & blob spammer is launched to fake transactions sent to the network
// - Forkmon will be launched after CL genesis has happened // - Forkmon for EL & CL will be launched
// - A prometheus will be started, coupled with grafana // - A prometheus will be started, coupled with grafana
// - A beacon metrics gazer will be launched
// - A light beacon chain explorer will be launched
// - Default: ["tx_spammer", "blob_spammer", "cl_fork_mon", "el_forkmon", "beacon_metrics_gazer", "dora"," "prometheus_grafana"]
"additional_services": [ "additional_services": [
"tx_spammer", "tx_spammer",
"blob_spammer", "blob_spammer",
...@@ -233,7 +236,8 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -233,7 +236,8 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"cl_forkmon", "cl_forkmon",
"el_forkmon", "el_forkmon",
"beacon_metrics_gazer", "beacon_metrics_gazer",
"explorer", "dora",
"full_beaconchain_explorer",
"prometheus_grafana" "prometheus_grafana"
], ],
......
...@@ -298,32 +298,23 @@ def run(plan, args={}): ...@@ -298,32 +298,23 @@ def run(plan, args={}):
beacon_metrics_gazer_prometheus_metrics_job beacon_metrics_gazer_prometheus_metrics_job
) )
plan.print("Succesfully launched beacon metrics gazer") plan.print("Succesfully launched beacon metrics gazer")
elif additional_service == "explorer": elif additional_service == "dora":
if args_with_right_defaults.explorer_version == "dora": plan.print("Launching dora")
plan.print("Launching dora") dora_config_template = read_file(static_files.DORA_CONFIG_TEMPLATE_FILEPATH)
dora_config_template = read_file( dora.launch_dora(plan, dora_config_template, all_cl_client_contexts)
static_files.DORA_CONFIG_TEMPLATE_FILEPATH plan.print("Succesfully launched dora")
) elif additional_service == "full_beaconchain_explorer":
dora.launch_dora(plan, dora_config_template, all_cl_client_contexts) plan.print("Launching full-beaconchain-explorer")
plan.print("Succesfully launched dora") full_beaconchain_explorer_config_template = read_file(
elif args_with_right_defaults.explorer_version == "full": static_files.FULL_BEACONCHAIN_CONFIG_TEMPLATE_FILEPATH
plan.print("Launching full-beaconchain-explorer") )
full_beaconchain_explorer_config_template = read_file( full_beaconchain_explorer.launch_full_beacon(
static_files.FULL_BEACONCHAIN_CONFIG_TEMPLATE_FILEPATH plan,
) full_beaconchain_explorer_config_template,
full_beaconchain_explorer.launch_full_beacon( all_cl_client_contexts,
plan, all_el_client_contexts,
full_beaconchain_explorer_config_template, )
all_cl_client_contexts, plan.print("Succesfully launched full-beaconchain-explorer")
all_el_client_contexts,
)
plan.print("Succesfully launched full-beaconchain-explorer")
else:
fail(
"expected explorer_version to be one of (dora, full) but got {0} which is invalid".format(
args_with_right_defaults.explorer_version
)
)
elif additional_service == "prometheus_grafana": elif additional_service == "prometheus_grafana":
# Allow prometheus to be launched last so is able to collect metrics from other services # Allow prometheus to be launched last so is able to collect metrics from other services
launch_prometheus_grafana = True launch_prometheus_grafana = True
......
...@@ -34,7 +34,7 @@ DEFAULT_ADDITIONAL_SERVICES = [ ...@@ -34,7 +34,7 @@ DEFAULT_ADDITIONAL_SERVICES = [
"cl_forkmon", "cl_forkmon",
"el_forkmon", "el_forkmon",
"beacon_metrics_gazer", "beacon_metrics_gazer",
"explorer", "dora",
"prometheus_grafana", "prometheus_grafana",
] ]
...@@ -46,8 +46,6 @@ ATTR_TO_BE_SKIPPED_AT_ROOT = ( ...@@ -46,8 +46,6 @@ ATTR_TO_BE_SKIPPED_AT_ROOT = (
"goomy_blob_params", "goomy_blob_params",
) )
DEFAULT_EXPLORER_VERSION = "dora"
package_io_constants = import_module("../package_io/constants.star") package_io_constants = import_module("../package_io/constants.star")
genesis_constants = import_module( genesis_constants = import_module(
...@@ -63,7 +61,6 @@ def parse_input(plan, input_args): ...@@ -63,7 +61,6 @@ def parse_input(plan, input_args):
result["mev_params"] = get_default_mev_params() result["mev_params"] = get_default_mev_params()
result["launch_additional_services"] = True result["launch_additional_services"] = True
result["additional_services"] = DEFAULT_ADDITIONAL_SERVICES result["additional_services"] = DEFAULT_ADDITIONAL_SERVICES
result["explorer_version"] = DEFAULT_EXPLORER_VERSION
for attr in input_args: for attr in input_args:
value = input_args[attr] value = input_args[attr]
...@@ -180,7 +177,6 @@ def parse_input(plan, input_args): ...@@ -180,7 +177,6 @@ def parse_input(plan, input_args):
mev_type=result["mev_type"], mev_type=result["mev_type"],
snooper_enabled=result["snooper_enabled"], snooper_enabled=result["snooper_enabled"],
parallel_keystore_generation=result["parallel_keystore_generation"], parallel_keystore_generation=result["parallel_keystore_generation"],
explorer_version=result["explorer_version"],
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment