diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index 8afb161d80..7782a76750 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -19,9 +19,9 @@ func e2eMinimal(t *testing.T, v int, cfgo ...types.E2EConfigOpt) *testRunner { require.NoError(t, params.SetActive(types.StartAt(v, params.E2ETestConfig()))) require.NoError(t, e2eParams.Init(t, e2eParams.StandardBeaconCount)) - // Run for 14 epochs if not in long-running to confirm long-running has no issues. + // Run for 12 epochs if not in long-running to confirm long-running has no issues. var err error - epochsToRun := 14 + epochsToRun := 12 epochStr, longRunning := os.LookupEnv("E2E_EPOCHS") if longRunning { epochsToRun, err = strconv.Atoi(epochStr) @@ -56,7 +56,7 @@ func e2eMinimal(t *testing.T, v int, cfgo ...types.E2EConfigOpt) *testRunner { ev.AltairForkTransition, ev.BellatrixForkTransition, ev.CapellaForkTransition, - ev.DenebForkTransition, + // ev.DenebForkTransition, // TODO(12750): Enable this when geth main branch's engine API support. ev.APIMiddlewareVerifyIntegrity, ev.APIGatewayV1Alpha1VerifyIntegrity, ev.FinishedSyncing, @@ -133,7 +133,7 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfg *params.Beaco ev.AltairForkTransition, ev.BellatrixForkTransition, ev.CapellaForkTransition, - ev.DenebForkTransition, + // ev.DenebForkTransition, // TODO(12750): Enable this when geth main branch's engine API support. ev.APIMiddlewareVerifyIntegrity, ev.APIGatewayV1Alpha1VerifyIntegrity, ev.FinishedSyncing, @@ -190,7 +190,7 @@ func scenarioEvals() []types.Evaluator { ev.AltairForkTransition, ev.BellatrixForkTransition, ev.CapellaForkTransition, - ev.DenebForkTransition, + // ev.DenebForkTransition, // TODO(12750): Enable this when geth main branch's engine API support. ev.APIMiddlewareVerifyIntegrity, ev.APIGatewayV1Alpha1VerifyIntegrity, ev.FinishedSyncing, @@ -212,7 +212,7 @@ func scenarioEvalsMulti() []types.Evaluator { ev.AltairForkTransition, ev.BellatrixForkTransition, ev.CapellaForkTransition, - ev.DenebForkTransition, + // ev.DenebForkTransition, // TODO(12750): Enable this when geth main branch's engine API support. ev.APIMiddlewareVerifyIntegrity, ev.APIGatewayV1Alpha1VerifyIntegrity, ev.FinishedSyncing, diff --git a/testing/endtoend/evaluators/fork.go b/testing/endtoend/evaluators/fork.go index f4e0823e17..54d4499be0 100644 --- a/testing/endtoend/evaluators/fork.go +++ b/testing/endtoend/evaluators/fork.go @@ -47,12 +47,6 @@ var CapellaForkTransition = types.Evaluator{ Evaluation: capellaForkOccurs, } -var DenebForkTransition = types.Evaluator{ - Name: "deneb_fork_transition_%d", - Policy: policies.OnEpoch(helpers.DenebE2eForkEpoch), - Evaluation: denebForkOccurs, -} - func altairForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) error { conn := conns[0] client := ethpb.NewBeaconNodeValidatorClient(conn) @@ -182,46 +176,3 @@ func capellaForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) er } return nil } - -func denebForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) error { - conn := conns[0] - client := ethpb.NewBeaconNodeValidatorClient(conn) - ctx, cancel := context.WithTimeout(context.Background(), streamDeadline) - defer cancel() - stream, err := client.StreamBlocksAltair(ctx, ðpb.StreamBlocksRequest{VerifiedOnly: true}) - if err != nil { - return errors.Wrap(err, "failed to get stream") - } - fSlot, err := slots.EpochStart(helpers.DenebE2eForkEpoch) - if err != nil { - return err - } - if ctx.Err() == context.Canceled { - return errors.New("context canceled prematurely") - } - res, err := stream.Recv() - if err != nil { - return err - } - if res == nil || res.Block == nil { - return errors.New("nil block returned by beacon node") - } - - if res.GetBlock() == nil { - return errors.New("nil block returned by beacon node") - } - if res.GetDenebBlock() == nil { - return errors.Errorf("non-capella block returned after the fork with type %T", res.Block) - } - blk, err := blocks.NewSignedBeaconBlock(res.GetDenebBlock()) - if err != nil { - return err - } - if err := blocks.BeaconBlockIsNil(blk); err != nil { - return err - } - if blk.Block().Slot() < fSlot { - return errors.Errorf("wanted a block at slot >= %d but received %d", fSlot, blk.Block().Slot()) - } - return nil -} diff --git a/testing/endtoend/helpers/helpers.go b/testing/endtoend/helpers/helpers.go index a7e2be4f29..66a397ec68 100644 --- a/testing/endtoend/helpers/helpers.go +++ b/testing/endtoend/helpers/helpers.go @@ -40,7 +40,6 @@ const ( AltairE2EForkEpoch = params.AltairE2EForkEpoch BellatrixE2EForkEpoch = params.BellatrixE2EForkEpoch CapellaE2EForkEpoch = params.CapellaE2EForkEpoch - DenebE2eForkEpoch = params.DenebE2EForkEpoch ) // Graffiti is a list of sample graffiti strings.