Commit 6e8e290a authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

refactor: remove "launch_additional_services"' (#315)

parent 9bf99793
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
"cl_client_type": "teku" "cl_client_type": "teku"
} }
], ],
"launch_additional_services": false, "additional_services": [],
"disable_peer_scoring": true "disable_peer_scoring": true
} }
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "lighthouse" "cl_client_type": "lighthouse"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -28,5 +28,5 @@ ...@@ -28,5 +28,5 @@
"network_params": { "network_params": {
"capella_fork_epoch": 1 "capella_fork_epoch": 1
}, },
"launch_additional_services": false "additional_services": []
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "teku" "cl_client_type": "teku"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "nimbus" "cl_client_type": "nimbus"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "prysm" "cl_client_type": "prysm"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
"cl_client_type": "lodestar" "cl_client_type": "lodestar"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
"cl_client_type": "teku" "cl_client_type": "teku"
} }
], ],
"launch_additional_services": false "additional_services": []
} }
...@@ -245,12 +245,6 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -245,12 +245,6 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"goomy_blob_args": [] "goomy_blob_args": []
}, },
// True by defaults, adds services defined in "additional_services" alongside the Ethereum network
// If set to false:
// - only Ethereum network (EL and CL nodes) will be launched. Nothing else (no transaction spammer)
// - params for the CL nodes will be ignored (e.g. CL node image, CL node extra params)
"launch_additional_services": true,
// By default includes // By default includes
// - A transaction spammer & blob 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 for EL will be launched // - Forkmon for EL will be launched
...@@ -368,7 +362,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -368,7 +362,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"capella_fork_epoch": 2, "capella_fork_epoch": 2,
"deneb_fork_epoch": 5 "deneb_fork_epoch": 5
}, },
"launch_additional_services": false, "additional_services": [],
"wait_for_finalization": false, "wait_for_finalization": false,
"wait_for_verifications": false, "wait_for_verifications": false,
"global_client_log_level": "info" "global_client_log_level": "info"
...@@ -407,7 +401,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -407,7 +401,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi
}, },
], ],
"mev_type": "mock", "mev_type": "mock",
"launch_additional_services": false "additional_services": []
} }
``` ```
...@@ -445,7 +439,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -445,7 +439,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"network_params": { "network_params": {
"capella_fork_epoch": 1 "capella_fork_epoch": 1
}, },
"launch_additional_services": false "additional_services": []
} }
``` ```
...@@ -465,7 +459,6 @@ To configure the package behaviour, you can modify your `network_params.json` fi ...@@ -465,7 +459,6 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"count": 2 "count": 2
} }
], ],
"launch_additional_services": true,
"snooper_enabled": true "snooper_enabled": true
} }
``` ```
......
...@@ -233,7 +233,6 @@ def run(plan, args={}): ...@@ -233,7 +233,6 @@ def run(plan, args={}):
) )
all_mevboost_contexts.append(mev_boost_context) all_mevboost_contexts.append(mev_boost_context)
if not args_with_right_defaults.launch_additional_services:
output = struct( output = struct(
all_participants=all_participants, all_participants=all_participants,
final_genesis_timestamp=final_genesis_timestamp, final_genesis_timestamp=final_genesis_timestamp,
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
"deneb_fork_epoch": 4, "deneb_fork_epoch": 4,
"electra_fork_epoch": null "electra_fork_epoch": null
}, },
"launch_additional_services": true,
"additional_services": [ "additional_services": [
"tx_spammer", "tx_spammer",
"blob_spammer", "blob_spammer",
......
...@@ -64,7 +64,6 @@ def input_parser(plan, input_args): ...@@ -64,7 +64,6 @@ def input_parser(plan, input_args):
# add default eth2 input params # add default eth2 input params
result["mev_type"] = None result["mev_type"] = None
result["mev_params"] = get_default_mev_params() result["mev_params"] = get_default_mev_params()
result["launch_additional_services"] = True
result["additional_services"] = DEFAULT_ADDITIONAL_SERVICES result["additional_services"] = DEFAULT_ADDITIONAL_SERVICES
result["grafana_additional_dashboards"] = [] result["grafana_additional_dashboards"] = []
result["tx_spammer_params"] = get_default_tx_spammer_params() result["tx_spammer_params"] = get_default_tx_spammer_params()
...@@ -195,7 +194,6 @@ def input_parser(plan, input_args): ...@@ -195,7 +194,6 @@ def input_parser(plan, input_args):
"interval_between_transactions" "interval_between_transactions"
], ],
), ),
launch_additional_services=result["launch_additional_services"],
additional_services=result["additional_services"], additional_services=result["additional_services"],
wait_for_finalization=result["wait_for_finalization"], wait_for_finalization=result["wait_for_finalization"],
global_client_log_level=result["global_client_log_level"], global_client_log_level=result["global_client_log_level"],
......
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