Fix to Post Submit E2E (#11733)

testing/endtoend/endtoend_setup_test.go

@@ -126,12 +126,14 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfgo ...types.E2E
 		ev.BellatrixForkTransition,
 		ev.APIMiddlewareVerifyIntegrity,
 		ev.APIGatewayV1Alpha1VerifyIntegrity,
-		beaconapi_evaluators.BeaconAPIMultiClientVerifyIntegrity,
 		ev.FinishedSyncing,
 		ev.AllNodesHaveSameHead,
 		ev.FeeRecipientIsPresent,
 		//ev.TransactionsPresent, TODO: Re-enable Transaction evaluator once it tx pool issues are fixed.
 	}
+	if crossClient {
+		evals = append(evals, beaconapi_evaluators.BeaconAPIMultiClientVerifyIntegrity)
+	}
 	testConfig := &types.E2EConfig{
 		BeaconFlags: []string{
 			fmt.Sprintf("--slots-per-archive-point=%d", params.BeaconConfig().SlotsPerEpoch*16),

testing/endtoend/mainnet_scenario_e2e_test.go

@@ -10,10 +10,6 @@ func TestEndToEnd_MainnetConfig_MultiClient(t *testing.T) {
 	e2eMainnet(t, false /*usePrysmSh*/, true /*useMultiClient*/).run()
 }
 
-func TestEndToEnd_MainnetConfig_Multiclient_CrossClient(t *testing.T) {
-	e2eMainnet(t, false /*usePrysmSh*/, true /*useMultiClient*/, types.WithValidatorCrossClient()).run()
-}
-
 func TestEndToEnd_MultiScenarioRun_Multiclient(t *testing.T) {
 	runner := e2eMainnet(t, false /*usePrysmSh*/, true /*useMultiClient*/, types.WithEpochs(22))
 	runner.config.Evaluators = scenarioEvalsMulti()

testing/endtoend/types/types.go

@@ -29,12 +29,6 @@ func WithCheckpointSync() E2EConfigOpt {
 	}
 }
 
-func WithValidatorCrossClient() E2EConfigOpt {
-	return func(cfg *E2EConfig) {
-		cfg.UseValidatorCrossClient = true
-	}
-}
-
 // E2EConfig defines the struct for all configurations needed for E2E testing.
 type E2EConfig struct {
 	TestCheckpointSync      bool