Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests depending on configuration flag #5650

Merged
merged 18 commits into from
Apr 27, 2020
Merged

Fix tests depending on configuration flag #5650

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6b5528d
fixes segfault
farazdagi Apr 27, 2020
bd9d24d
Merge branch 'master' into fix-nil-segfaults
farazdagi Apr 27, 2020
82708a3
upd state
farazdagi Apr 27, 2020
3ded6ab
Merge branch 'master' into fix-nil-segfaults
farazdagi Apr 27, 2020
001604d
updates shard=1
farazdagi Apr 27, 2020
44fde67
Merge refs/heads/master into fix-nil-segfaults
prylabs-bulldozer[bot] Apr 27, 2020
80462fb
Merge refs/heads/master into fix-nil-segfaults
prylabs-bulldozer[bot] Apr 27, 2020
30491df
Merge refs/heads/master into fix-nil-segfaults
prylabs-bulldozer[bot] Apr 27, 2020
e320829
fixes tests
farazdagi Apr 27, 2020
da8efed
Merge branch 'fix-nil-segfaults' of github.com:prysmaticlabs/prysm in…
farazdagi Apr 27, 2020
b1374e9
reset config to nil
farazdagi Apr 27, 2020
6d40006
add flag assertion to other beacon-chain/rpc files
farazdagi Apr 27, 2020
c87a9ec
Merge refs/heads/master into fix-nil-segfaults
prylabs-bulldozer[bot] Apr 27, 2020
d43588a
fix the rest featureconfig.init calls
farazdagi Apr 27, 2020
d59a5cc
Merge branch 'fix-nil-segfaults' of github.com:prysmaticlabs/prysm in…
farazdagi Apr 27, 2020
775b903
remove config setting from init
farazdagi Apr 27, 2020
459c1f8
gazelle
farazdagi Apr 27, 2020
646705c
reset shard back to 4
farazdagi Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion beacon-chain/rpc/beacon/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ go_test(
"validators_test.go",
],
embed = [":go_default_library"],
shard_count = 4,
shard_count = 1,
deps = [
"//beacon-chain/blockchain/testing:go_default_library",
"//beacon-chain/cache:go_default_library",
Expand Down
28 changes: 12 additions & 16 deletions beacon-chain/rpc/beacon/assignments_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ import (
)

func TestServer_ListAssignments_CannotRequestFutureEpoch(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: true,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt: true})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand All @@ -52,10 +50,8 @@ func TestServer_ListAssignments_CannotRequestFutureEpoch(t *testing.T) {
}

func TestServer_ListAssignments_NoResults(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: true,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt: true})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand Down Expand Up @@ -105,10 +101,8 @@ func TestServer_ListAssignments_NoResults(t *testing.T) {
}

func TestServer_ListAssignments_Pagination_InputOutOfRange(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: true,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt: true})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand Down Expand Up @@ -269,6 +263,8 @@ func TestServer_ListAssignments_Pagination_DefaultPageSize_FromArchive(t *testin
helpers.ClearCache()
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt: true})
defer resetCfg()

ctx := context.Background()
count := 500
Expand Down Expand Up @@ -368,6 +364,8 @@ func TestServer_ListAssignments_FilterPubkeysIndices_NoPagination(t *testing.T)
helpers.ClearCache()
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt: true})
defer resetCfg()

ctx := context.Background()
count := 100
Expand Down Expand Up @@ -449,10 +447,8 @@ func TestServer_ListAssignments_FilterPubkeysIndices_NoPagination(t *testing.T)
}

func TestServer_ListAssignments_CanFilterPubkeysIndices_WithPagination(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: true,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt: true})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand Down
29 changes: 6 additions & 23 deletions beacon-chain/rpc/beacon/attestations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,8 @@ func TestServer_mapAttestationToTargetRoot(t *testing.T) {
}

func TestServer_ListIndexedAttestations_NewStateManagnmentDisabled(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: false,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt:false})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand Down Expand Up @@ -612,12 +610,8 @@ func TestServer_ListIndexedAttestations_NewStateManagnmentDisabled(t *testing.T)
func TestServer_ListIndexedAttestations_GenesisEpoch(t *testing.T) {
params.OverrideBeaconConfig(params.MainnetConfig())
defer params.OverrideBeaconConfig(params.MinimalSpecConfig())

featureconfig.Init(&featureconfig.Flags{NewStateMgmt: true})
defer featureconfig.Init(&featureconfig.Flags{NewStateMgmt: false})

cfg := assertNewStateMgmtIsEnabled()
defer featureconfig.Init(cfg)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt:true})
defer resetCfg()
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
helpers.ClearCache()
Expand Down Expand Up @@ -753,8 +747,8 @@ func TestServer_ListIndexedAttestations_GenesisEpoch(t *testing.T) {
func TestServer_ListIndexedAttestations_OldEpoch(t *testing.T) {
params.OverrideBeaconConfig(params.MainnetConfig())
defer params.OverrideBeaconConfig(params.MinimalSpecConfig())
cfg := assertNewStateMgmtIsEnabled()
defer featureconfig.Init(cfg)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt:true})
defer resetCfg()
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
helpers.ClearCache()
Expand Down Expand Up @@ -1236,14 +1230,3 @@ func TestServer_StreamAttestations_OnSlotTick(t *testing.T) {
}
<-exitRoutine
}

// assertNewStateMgmtIsEnabled asserts that state management feature is enabled.
func assertNewStateMgmtIsEnabled() *featureconfig.Flags {
cfg := featureconfig.Get()
if cfg.NewStateMgmt {
cfgUpd := cfg.Copy()
cfgUpd.NewStateMgmt = true
featureconfig.Init(cfgUpd)
}
return cfg
}
1 change: 1 addition & 0 deletions beacon-chain/rpc/beacon/blocks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ func TestServer_ListBlocks_Pagination(t *testing.T) {
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
ctx := context.Background()
t.Skip("re-init")

count := uint64(100)
blks := make([]*ethpb.SignedBeaconBlock, count)
Expand Down
14 changes: 6 additions & 8 deletions beacon-chain/rpc/beacon/committees_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ func TestServer_ListBeaconCommittees_CurrentEpoch(t *testing.T) {
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
helpers.ClearCache()
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt:true})
defer resetCfg()

numValidators := 128
ctx := context.Background()
Expand Down Expand Up @@ -87,10 +89,8 @@ func TestServer_ListBeaconCommittees_CurrentEpoch(t *testing.T) {
}

func TestServer_ListBeaconCommittees_PreviousEpoch(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: false,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt:false})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand Down Expand Up @@ -162,10 +162,8 @@ func TestServer_ListBeaconCommittees_PreviousEpoch(t *testing.T) {
}

func TestServer_ListBeaconCommittees_FromArchive(t *testing.T) {
config := &featureconfig.Flags{
NewStateMgmt: false,
}
featureconfig.Init(config)
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{NewStateMgmt:false})
defer resetCfg()

db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)
Expand Down
18 changes: 4 additions & 14 deletions beacon-chain/rpc/beacon/slashings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,8 @@ func TestServer_SubmitProposerSlashing(t *testing.T) {

func TestServer_SubmitProposerSlashingBroadcast(t *testing.T) {
ctx := context.Background()
cfg := featureconfig.Get()
cfg.BroadcastSlashings = true
featureconfig.Init(cfg)
defer func() {
cfg.BroadcastSlashings = false
featureconfig.Init(cfg)
}()
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{BroadcastSlashings:true})
defer resetCfg()

st, privs := testutil.DeterministicGenesisState(t, 64)
slashedVal, err := st.ValidatorAtIndex(5)
Expand Down Expand Up @@ -175,13 +170,8 @@ func TestServer_SubmitAttesterSlashing(t *testing.T) {

func TestServer_SubmitAttesterSlashingBroadcast(t *testing.T) {
ctx := context.Background()
cfg := featureconfig.Get()
cfg.BroadcastSlashings = true
featureconfig.Init(cfg)
defer func() {
cfg.BroadcastSlashings = false
featureconfig.Init(cfg)
}()
resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{BroadcastSlashings:true})
defer resetCfg()
// We mark the validators at index 5, 6 as already slashed.
st, privs := testutil.DeterministicGenesisState(t, 64)
slashedVal, err := st.ValidatorAtIndex(5)
Expand Down
12 changes: 12 additions & 0 deletions beacon-chain/rpc/beacon/validators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ func (bs *Server) ListValidatorBalances(
return bs.listValidatorsBalancesUsingOldArchival(ctx, req)
}

if bs.GenesisTimeFetcher == nil {
return nil, status.Errorf(codes.Internal, "Nil genesis time fetcher")
}
currentEpoch := helpers.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot())
requestedEpoch := currentEpoch
switch q := req.QueryFilter.(type) {
Expand Down Expand Up @@ -163,6 +166,9 @@ func (bs *Server) listValidatorsBalancesUsingOldArchival(
res := make([]*ethpb.ValidatorBalances_Balance, 0)
filtered := map[uint64]bool{} // Track filtered validators to prevent duplication in the response.

if bs.HeadFetcher == nil {
return nil, status.Error(codes.Internal, "Nil head state")
}
headState, err := bs.HeadFetcher.HeadState(ctx)
if err != nil {
return nil, status.Error(codes.Internal, "Could not get head state")
Expand Down Expand Up @@ -578,10 +584,16 @@ func (bs *Server) GetValidatorActiveSetChanges(
func (bs *Server) getValidatorActiveSetChangesUsingOldArchival(
ctx context.Context, req *ethpb.GetValidatorActiveSetChangesRequest,
) (*ethpb.ActiveSetChanges, error) {
if bs.HeadFetcher == nil {
return nil, status.Error(codes.Internal, "Nil head state")
}
headState, err := bs.HeadFetcher.HeadState(ctx)
if err != nil {
return nil, status.Error(codes.Internal, "Could not get head state")
}
if bs.BeaconDB == nil {
return nil, status.Error(codes.Internal, "Nil beacon DB")
}
currentEpoch := helpers.CurrentEpoch(headState)
requestedEpoch := currentEpoch
requestingGenesis := false
Expand Down
Loading