mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-26 05:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve queue (#3611)

Browse Source
This commit is contained in:
Raul Jordan 2019-09-26 22:34:51 -05:00 committed by GitHub
parent 4a73bc13b5
commit 9dc1674417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon-chain/rpc/beacon_chain_server.go
View File

@ -504,12 +504,12 @@ func (bs *BeaconChainServer) GetValidatorQueue(
}
// Get the public keys for the validators in the queues up to the allowed churn limits.
activationQueueKeys := make([][]byte, len(activationQ[:activationQueueChurn]))
exitQueueKeys := make([][]byte, len(exitQueueIndices[:exitQueueChurn]))
for i, idx := range activationQ[:activationQueueChurn] {
activationQueueKeys := make([][]byte, len(activationQ))
exitQueueKeys := make([][]byte, len(exitQueueIndices))
for i, idx := range activationQ {
activationQueueKeys[i] = headState.Validators[idx].PublicKey
}
for i, idx := range exitQueueIndices[:exitQueueChurn] {
for i, idx := range exitQueueIndices {
exitQueueKeys[i] = headState.Validators[idx].PublicKey
}

120
beacon-chain/rpc/beacon_chain_server_test.go
View File

@ -971,66 +971,18 @@ func TestBeaconChainServer_GetValidatorQueue_PendingActivation(t *testing.T) {
[]byte("2"),
[]byte("3"),
}
wantChurn, err := helpers.ValidatorChurnLimit(headState)
if err != nil {
t.Fatal(err)
}
if res.ChurnLimit != wantChurn {
t.Errorf("Wanted churn %d, received %d", wantChurn, res.ChurnLimit)
}
if !reflect.DeepEqual(res.ActivationPublicKeys, wanted) {
t.Errorf("Wanted %v, received %v", wanted, res.ActivationPublicKeys)
}
}
func TestBeaconChainServer_GetValidatorQueue_PendingActivation_BelowChurn(t *testing.T) {
activeValidatorCount := uint64(100)
validators := make([]*ethpb.Validator, activeValidatorCount)
// We create a bunch of active validators.
for i := uint64(0); i < activeValidatorCount; i++ {
validators[i] = &ethpb.Validator{
ActivationEpoch: 0,
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
PublicKey: []byte(strconv.Itoa(int(i))),
}
}
headState := &pbp2p.BeaconState{
Validators: validators,
FinalizedCheckpoint: &ethpb.Checkpoint{
Epoch: 0,
},
}
churnLimit, err := helpers.ValidatorChurnLimit(headState)
if err != nil {
t.Fatal(err)
}
pendingActiveCount := churnLimit * 2
wantedKeys := make([][]byte, int(churnLimit*2))
for i := uint64(0); i < pendingActiveCount; i++ {
val := &ethpb.Validator{
ActivationEpoch: helpers.DelayedActivationExitEpoch(0),
ActivationEligibilityEpoch: i + 1,
PublicKey: []byte(strconv.Itoa(len(validators))),
}
validators = append(validators, val)
wantedKeys[i] = val.PublicKey
}
headState.Validators = validators
bs := &BeaconChainServer{
headFetcher: &mock.ChainService{
State: headState,
},
}
res, err := bs.GetValidatorQueue(context.Background(), &ptypes.Empty{})
if err != nil {
t.Fatal(err)
}
if len(res.ActivationPublicKeys) > int(churnLimit) {
t.Errorf(
"Expected to clip queued activations below churn limit %d, received %d in queue",
churnLimit,
len(res.ActivationPublicKeys),
)
}
if !reflect.DeepEqual(res.ActivationPublicKeys, wantedKeys[:churnLimit]) {
t.Errorf("Received %v, wanted %v", res.ActivationPublicKeys, wantedKeys[:churnLimit])
}
}
func TestBeaconChainServer_GetValidatorQueue_PendingExit(t *testing.T) {
headState := &pbp2p.BeaconState{
Validators: []*ethpb.Validator{
@ -1072,62 +1024,18 @@ func TestBeaconChainServer_GetValidatorQueue_PendingExit(t *testing.T) {
[]byte("2"),
[]byte("3"),
}
wantChurn, err := helpers.ValidatorChurnLimit(headState)
if err != nil {
t.Fatal(err)
}
if res.ChurnLimit != wantChurn {
t.Errorf("Wanted churn %d, received %d", wantChurn, res.ChurnLimit)
}
if !reflect.DeepEqual(res.ExitPublicKeys, wanted) {
t.Errorf("Wanted %v, received %v", wanted, res.ExitPublicKeys)
}
}
func TestBeaconChainServer_GetValidatorQueue_PendingExit_BelowChurn(t *testing.T) {
activeValidatorCount := uint64(100)
validators := make([]*ethpb.Validator, activeValidatorCount)
// We create a bunch of active validators.
for i := uint64(0); i < activeValidatorCount; i++ {
validators[i] = &ethpb.Validator{
ActivationEpoch: 0,
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
PublicKey: []byte(strconv.Itoa(int(i))),
}
}
headState := &pbp2p.BeaconState{
Validators: validators,
FinalizedCheckpoint: &ethpb.Checkpoint{
Epoch: 0,
},
}
churnLimit, err := helpers.ValidatorChurnLimit(headState)
if err != nil {
t.Fatal(err)
}
pendingActiveCount := churnLimit * 2
wantedKeys := make([][]byte, int(churnLimit*2))
for i := uint64(0); i < pendingActiveCount; i++ {
validators[i].ExitEpoch = pendingActiveCount
validators[i].WithdrawableEpoch = i
wantedKeys[i] = validators[i].PublicKey
}
headState.Validators = validators
bs := &BeaconChainServer{
headFetcher: &mock.ChainService{
State: headState,
},
}
res, err := bs.GetValidatorQueue(context.Background(), &ptypes.Empty{})
if err != nil {
t.Fatal(err)
}
if len(res.ExitPublicKeys) > int(churnLimit) {
t.Errorf(
"Expected to clip queued exits below churn limit %d, received %d in queue",
churnLimit,
len(res.ExitPublicKeys),
)
}
if !reflect.DeepEqual(res.ExitPublicKeys, wantedKeys[:churnLimit]) {
t.Errorf("Received %v, wanted %v", res.ExitPublicKeys, wantedKeys[:churnLimit])
}
}
func TestBeaconChainServer_ListAssignmentsInputOutOfRange(t *testing.T) {
db := dbTest.SetupDB(t)
defer dbTest.TeardownDB(t, db)