Commit baa04e91 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

fix: separate vc (#526)

Co-authored-by: default avatarGyanendra Mishra <anomaly.the@gmail.com>
parent f6e1b136
...@@ -268,6 +268,7 @@ participants: ...@@ -268,6 +268,7 @@ participants:
# - nimbus: statusim/nimbus-eth2:multiarch-latest # - nimbus: statusim/nimbus-eth2:multiarch-latest
# - prysm: gcr.io/prysmaticlabs/prysm/beacon-chain:latest # - prysm: gcr.io/prysmaticlabs/prysm/beacon-chain:latest
# - lodestar: chainsafe/lodestar:next # - lodestar: chainsafe/lodestar:next
# - grandine: ethpandaops/grandine:develop
cl_image: "" cl_image: ""
# The log level string that this participant's CL client should log at # The log level string that this participant's CL client should log at
......
...@@ -384,10 +384,14 @@ def parse_network_params(input_args): ...@@ -384,10 +384,14 @@ def parse_network_params(input_args):
if participant["use_separate_vc"] == None: if participant["use_separate_vc"] == None:
# Default to false for CL clients that can run validator clients # Default to false for CL clients that can run validator clients
# in the same process. # in the same process.
if cl_type in ( if (
constants.CL_TYPE.nimbus, cl_type
constants.CL_TYPE.teku, in (
constants.CL_TYPE.grandine, constants.CL_TYPE.nimbus,
constants.CL_TYPE.teku,
constants.CL_TYPE.grandine,
)
and vc_type == ""
): ):
participant["use_separate_vc"] = False participant["use_separate_vc"] = False
else: else:
...@@ -398,12 +402,6 @@ def parse_network_params(input_args): ...@@ -398,12 +402,6 @@ def parse_network_params(input_args):
vc_type = cl_type vc_type = cl_type
participant["vc_type"] = vc_type participant["vc_type"] = vc_type
if (
cl_type == constants.CL_TYPE.grandine
and vc_type != constants.CL_TYPE.grandine
):
fail("grandine does not support running a different validator client")
vc_image = participant["vc_image"] vc_image = participant["vc_image"]
if vc_image == "": if vc_image == "":
if cl_image == "": if cl_image == "":
......
...@@ -282,19 +282,8 @@ def launch_participant_network( ...@@ -282,19 +282,8 @@ def launch_participant_network(
vc_context = None vc_context = None
snooper_beacon_context = None snooper_beacon_context = None
if participant.snooper_enabled:
if (
participant.cl_type == constants.CL_TYPE.teku
or participant.cl_type == constants.CL_TYPE.nimbus
or participant.cl_type == constants.CL_TYPE.grandine
) and participant.use_separate_vc != False:
plan.print(
"Beacon snooper not supported for non split operation for {0}".format(
participant.cl_type
)
)
continue
if participant.snooper_enabled:
snooper_service_name = "snooper-beacon-{0}-{1}-{2}".format( snooper_service_name = "snooper-beacon-{0}-{1}-{2}".format(
index_str, cl_type, vc_type index_str, cl_type, vc_type
) )
......
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