E2E Improvements (#6587)

* Change long-running e2e to run minimally
* Merge branch 'master' into e2e-config-change
* Remove deposits flag
* Merge branch 'e2e-config-change' of github.com:prysmaticlabs/prysm into e2e-config-change
* Merge branch 'master' of github.com:prysmaticlabs/prysm into e2e-config-change
* Reduce secondsperslot
* Add todo
* Merge branch 'master' of github.com:prysmaticlabs/prysm into e2e-config-change
* Merge refs/heads/master into e2e-config-change
* Merge refs/heads/master into e2e-config-change
* Merge refs/heads/master into e2e-config-change
* Merge refs/heads/master into e2e-config-change
* Merge refs/heads/master into e2e-config-change
* Merge refs/heads/master into e2e-config-change
This commit is contained in:
Ivan Martinez 2020-07-14 14:08:17 -04:00 committed by GitHub
parent d9fd2521af
commit 5278b75c02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions

View File

@ -155,6 +155,8 @@ func runEndToEndTest(t *testing.T, config *types.E2EConfig) {
return
}
// Sleep a slot to make sure the synced state is made.
time.Sleep(time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second)
syncEvaluators := []types.Evaluator{ev.FinishedSyncing, ev.AllNodesHaveSameHead}
for _, evaluator := range syncEvaluators {
t.Run(evaluator.Name, func(t *testing.T) {

View File

@ -20,7 +20,8 @@ func TestEndToEnd_Long_MinimalConfig(t *testing.T) {
t.Fatal(err)
}
epochsToRun := 20
// Run for 5 epochs if not in long-running to confirm long-running has no issues.
epochsToRun := 5
var err error
epochStr, ok := os.LookupEnv("E2E_EPOCHS")
if ok {
@ -28,8 +29,6 @@ func TestEndToEnd_Long_MinimalConfig(t *testing.T) {
if err != nil {
t.Fatal(err)
}
} else {
t.Skip("E2E_EPOCHS not set")
}
minimalConfig := &types.E2EConfig{
@ -38,7 +37,7 @@ func TestEndToEnd_Long_MinimalConfig(t *testing.T) {
},
ValidatorFlags: []string{},
EpochsToRun: uint64(epochsToRun),
TestSync: false,
TestSync: true,
TestDeposits: true,
TestSlasher: true,
Evaluators: []types.Evaluator{

View File

@ -625,5 +625,5 @@ var E2EBeaconChainFlags = []string{
"--check-head-state",
"--attestation-aggregation-strategy=max_cover",
"--dev",
"--enable-finalized-deposits-cache",
// "--enable-finalized-deposits-cache", // TODO(6588): Enable in e2e
}

View File

@ -15,7 +15,7 @@ func E2ETestConfig() *BeaconChainConfig {
e2eConfig.GenesisDelay = 30 // 30 seconds so E2E has enough time to process deposits and get started.
// Time parameters.
e2eConfig.SecondsPerSlot = 8
e2eConfig.SecondsPerSlot = 12
e2eConfig.SecondsPerETH1Block = 2
e2eConfig.Eth1FollowDistance = 4
e2eConfig.ShardCommitteePeriod = 4