clean up

prysmaticlabs · May 19, 2022 · e2e402f · e2e402f
1 parent 2516c54
commit e2e402f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/testing/endtoend/component_handler_test.go b/testing/endtoend/component_handler_test.go
@@ -165,7 +165,7 @@ func (c *componentHandler) setup() {
 			comps = append(comps, web3RemoteSigner)
 		}
 		if err := helpers.ComponentsStarted(ctx, comps); err != nil {
-			return errors.Wrap(err, "validator nodes require beacon nodes to run")
+			return errors.Wrap(err, "validator nodes require components to run")
 		}
 		if err := validatorNodes.Start(ctx); err != nil {
 			return errors.Wrap(err, "failed to start validator nodes")

diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go
@@ -26,10 +26,6 @@ func e2eMinimal(t *testing.T, useWeb3RemoteSigner bool, extraEpochs uint64) *tes
 		epochsToRun, err = strconv.Atoi(epochStr)
 		require.NoError(t, err)
 	}
-	// TODO(#10053): Web3signer does not support bellatrix yet.
-	if useWeb3RemoteSigner {
-		epochsToRun = helpers.BellatrixE2EForkEpoch - 1
-	}
 	seed := 0
 	seedStr, isValid := os.LookupEnv("E2E_SEED")
 	if isValid {
@@ -45,13 +41,13 @@ func e2eMinimal(t *testing.T, useWeb3RemoteSigner bool, extraEpochs uint64) *tes
 		ev.ValidatorsAreActive,
 		ev.ValidatorsParticipatingAtEpoch(2),
 		ev.FinalizationOccurs(3),
+		ev.VerifyBlockGraffiti,
 		ev.PeersCheck,
+		ev.ProposeVoluntaryExit,
+		ev.ValidatorHasExited,
 		ev.ProcessesDepositsInBlocks,
-		ev.VerifyBlockGraffiti,
 		ev.ActivatesDepositedValidators,
 		ev.DepositedValidatorsAreActive,
-		ev.ProposeVoluntaryExit,
-		ev.ValidatorHasExited,
 		ev.ValidatorsVoteWithTheMajority,
 		ev.ColdStateCheckpoint,
 		ev.AltairForkTransition,