Aligning ETH2.0 spec - Make Epoch First Citizen (Package: Committee)

beacon-chain/blockchain/service_test.go

@@ -337,7 +337,7 @@ func TestRunningChainService(t *testing.T) {
 		t.Fatalf("Can't get state from db %v", err)
 	}
 
-	validators := make([]*pb.ValidatorRecord, params.BeaconConfig().EpochLength*2)
+	validators := make([]*pb.ValidatorRecord, params.BeaconConfig().DepositsForChainStart)
 	randaoCommit := hashutil.RepeatHash([32]byte{}, 1)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{

beacon-chain/chaintest/tests/state-tests/block-processing.yaml

@@ -6,11 +6,11 @@ version: 1.0
 test_cases:
   - config:
       epoch_length: 64
-      deposits_for_chain_start: 1000
+      deposits_for_chain_start: 5000
       num_slots: 32 # Testing advancing state to slot < EpochLength
     results:
       slot: 32
-      num_validators: 1000
+      num_validators: 5000
   - config:
       epoch_length: 63
       deposits_for_chain_start: 16384

beacon-chain/core/balances/rewards_penalties_test.go

@@ -199,7 +199,7 @@ func TestChainHeadRewardsPenalties(t *testing.T) {
 }
 
 func TestInclusionDistRewards_Ok(t *testing.T) {
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*4)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch: config.FarFutureEpoch,
@@ -217,10 +217,9 @@ func TestInclusionDistRewards_Ok(t *testing.T) {
 	}{
 		{[]uint64{}},
 		{[]uint64{237, 224}},
-		{[]uint64{237, 224, 2, 242}},
 	}
 	for _, tt := range tests {
-		validatorBalances := make([]uint64, config.EpochLength*4)
+		validatorBalances := make([]uint64, len(validators))
 		for i := 0; i < len(validatorBalances); i++ {
 			validatorBalances[i] = params.BeaconConfig().MaxDeposit
 		}
@@ -428,7 +427,7 @@ func TestInactivityExitedPenality(t *testing.T) {
 }
 
 func TestInactivityInclusionPenalty_Ok(t *testing.T) {
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*4)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch: config.FarFutureEpoch,
@@ -445,7 +444,6 @@ func TestInactivityInclusionPenalty_Ok(t *testing.T) {
 	}{
 		{[]uint64{}},
 		{[]uint64{237, 224}},
-		{[]uint64{237, 224, 2, 242}},
 	}
 	for _, tt := range tests {
 		validatorBalances := make([]uint64, config.EpochLength*4)
@@ -507,7 +505,7 @@ func TestInactivityInclusionPenalty_NotOk(t *testing.T) {
 }
 
 func TestAttestationInclusionRewards(t *testing.T) {
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*4)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch: config.FarFutureEpoch,

beacon-chain/core/blocks/block_operations_test.go

@@ -17,7 +17,7 @@ import (
 )
 
 func TestProcessBlockRandao_UnequalBlockAndProposerRandao(t *testing.T) {
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*2)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch: config.FarFutureEpoch,
@@ -48,7 +48,7 @@ func TestProcessBlockRandao_UnequalBlockAndProposerRandao(t *testing.T) {
 
 func TestProcessBlockRandao_CreateRandaoMixAndUpdateProposer(t *testing.T) {
 	randaoCommit := hashutil.RepeatHash([32]byte{}, 1)
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*2)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch:              config.FarFutureEpoch,
@@ -296,14 +296,14 @@ func TestProcessProposerSlashings_AppliesCorrectStatus(t *testing.T) {
 	// We test the case when data is correct and verify the validator
 	// registry has been updated.
 
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*2)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch:      config.FarFutureEpoch,
 			PenalizedEpoch: 2,
 		}
 	}
-	validatorBalances := make([]uint64, config.EpochLength*2)
+	validatorBalances := make([]uint64, len(validators))
 	for i := 0; i < len(validatorBalances); i++ {
 		validatorBalances[i] = config.MaxDeposit
 	}
@@ -654,13 +654,17 @@ func TestProcessAttesterSlashings_EmptyVoteIndexIntersection(t *testing.T) {
 func TestProcessAttesterSlashings_AppliesCorrectStatus(t *testing.T) {
 	// We test the case when data is correct and verify the validator
 	// registry has been updated.
-	validators := make([]*pb.ValidatorRecord, config.EpochLength*2)
+	validators := make([]*pb.ValidatorRecord, config.DepositsForChainStart)
 	for i := 0; i < len(validators); i++ {
 		validators[i] = &pb.ValidatorRecord{
 			ExitEpoch:      config.FarFutureEpoch,
 			PenalizedEpoch: 6,
 		}
 	}
+	validatorBalances := make([]uint64, len(validators))
+	for i := 0; i < len(validatorBalances); i++ {
+		validatorBalances[i] = config.MaxDeposit
+	}
 
 	att1 := &pb.AttestationData{
 		Slot:          5,
@@ -689,7 +693,7 @@ func TestProcessAttesterSlashings_AppliesCorrectStatus(t *testing.T) {
 	beaconState := &pb.BeaconState{
 		ValidatorRegistry:       validators,
 		Slot:                    currentSlot,
-		ValidatorBalances:       []uint64{32, 32, 32, 32, 32, 32},
+		ValidatorBalances:       validatorBalances,
 		LatestPenalizedBalances: []uint64{0},
 	}
 	block := &pb.BeaconBlock{

beacon-chain/core/epoch/epoch_operations.go

@@ -238,7 +238,6 @@ func InclusionDistance(state *pb.BeaconState, validatorIndex uint64) (uint64, er
 		if err != nil {
 			return 0, fmt.Errorf("could not get attestation participants: %v", err)
 		}
-
 		for _, index := range participatedValidators {
 			if index == validatorIndex {
 				return attestation.SlotIncluded - attestation.Data.Slot, nil

beacon-chain/core/epoch/epoch_operations_test.go

@@ -302,7 +302,7 @@ func TestHeadAttestationsNotOk(t *testing.T) {
 }
 
 func TestWinningRootOk(t *testing.T) {
-	state := buildState(0, config.EpochLength*2)
+	state := buildState(0, config.DepositsForChainStart)
 
 	// Generate 10 roots ([]byte{100}...[]byte{110})
 	var attestations []*pb.PendingAttestationRecord
@@ -347,7 +347,7 @@ func TestWinningRootOk(t *testing.T) {
 }
 
 func TestWinningRootCantGetParticipantBitfield(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	attestations := []*pb.PendingAttestationRecord{
 		{Data: &pb.AttestationData{
@@ -364,7 +364,7 @@ func TestWinningRootCantGetParticipantBitfield(t *testing.T) {
 }
 
 func TestAttestingValidatorsOk(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	var attestations []*pb.PendingAttestationRecord
 	for i := 0; i < 10; i++ {
@@ -386,14 +386,14 @@ func TestAttestingValidatorsOk(t *testing.T) {
 		t.Fatalf("Could not execute AttestingValidators: %v", err)
 	}
 
-	// Verify the winner root is attested by validator 45 based on shuffling.
-	if !reflect.DeepEqual(attestedValidators, []uint64{45}) {
-		t.Errorf("Active validators don't match. Wanted:[109, 97], Got: %v", attestedValidators)
+	// Verify the winner root is attested by validator 237 224 based on shuffling.
+	if !reflect.DeepEqual(attestedValidators, []uint64{237, 224}) {
+		t.Errorf("Active validators don't match. Wanted:[237,224], Got: %v", attestedValidators)
 	}
 }
 
 func TestAttestingValidatorsCantGetWinningRoot(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	attestation := &pb.PendingAttestationRecord{
 		Data: &pb.AttestationData{
@@ -410,7 +410,7 @@ func TestAttestingValidatorsCantGetWinningRoot(t *testing.T) {
 
 func TestTotalAttestingBalanceOk(t *testing.T) {
 	validatorsPerCommittee := uint64(2)
-	state := buildState(0, config.EpochLength*validatorsPerCommittee)
+	state := buildState(0, config.DepositsForChainStart)
 
 	// Generate 10 roots ([]byte{100}...[]byte{110})
 	var attestations []*pb.PendingAttestationRecord
@@ -440,7 +440,7 @@ func TestTotalAttestingBalanceOk(t *testing.T) {
 }
 
 func TestTotalAttestingBalanceCantGetWinningRoot(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	attestation := &pb.PendingAttestationRecord{
 		Data: &pb.AttestationData{
@@ -471,7 +471,7 @@ func TestTotalBalance(t *testing.T) {
 }
 
 func TestInclusionSlotOk(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	state.LatestAttestations = []*pb.PendingAttestationRecord{
 		{Data: &pb.AttestationData{},
@@ -484,7 +484,7 @@ func TestInclusionSlotOk(t *testing.T) {
 			ParticipationBitfield: []byte{0xFF},
 			SlotIncluded:          102},
 	}
-	slot, err := InclusionSlot(state, 45)
+	slot, err := InclusionSlot(state, 237)
 	if err != nil {
 		t.Fatalf("Could not execute InclusionSlot: %v", err)
 	}
@@ -495,7 +495,7 @@ func TestInclusionSlotOk(t *testing.T) {
 }
 
 func TestInclusionSlotBadBitfield(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 	state.LatestAttestations = []*pb.PendingAttestationRecord{
 		{Data: &pb.AttestationData{},
 			ParticipationBitfield: []byte{},
@@ -519,14 +519,14 @@ func TestInclusionSlotNotFound(t *testing.T) {
 }
 
 func TestInclusionDistanceOk(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	state.LatestAttestations = []*pb.PendingAttestationRecord{
 		{Data: &pb.AttestationData{},
 			ParticipationBitfield: []byte{0xFF},
 			SlotIncluded:          100},
 	}
-	distance, err := InclusionDistance(state, 45)
+	distance, err := InclusionDistance(state, 237)
 	if err != nil {
 		t.Fatalf("Could not execute InclusionDistance: %v", err)
 	}
@@ -540,7 +540,7 @@ func TestInclusionDistanceOk(t *testing.T) {
 }
 
 func TestInclusionDistanceBadBitfield(t *testing.T) {
-	state := buildState(0, config.EpochLength)
+	state := buildState(0, config.DepositsForChainStart)
 
 	state.LatestAttestations = []*pb.PendingAttestationRecord{
 		{Data: &pb.AttestationData{},

beacon-chain/core/epoch/epoch_processing.go

@@ -49,7 +49,7 @@ func CanProcessValidatorRegistry(state *pb.BeaconState) bool {
 	if state.FinalizedSlot <= state.ValidatorRegistryUpdateSlot {
 		return false
 	}
-	shardsProcessed := validators.CurrCommitteesCountPerSlot(state) * config.EpochLength
+	shardsProcessed := helpers.CurrentEpochCommitteeCount(state) * config.EpochLength
 	fmt.Println(shardsProcessed)
 	startShard := state.CurrentEpochStartShard
 	for i := startShard; i < shardsProcessed; i++ {
@@ -254,7 +254,7 @@ func ProcessValidatorRegistry(
 	state.CurrentEpochCalculationSlot = state.Slot
 
 	nextStartShard := (state.CurrentEpochStartShard +
-		validators.CurrCommitteesCountPerSlot(state)*config.EpochLength) %
+		helpers.CurrentEpochCommitteeCount(state)*config.EpochLength) %
 		config.EpochLength
 	state.CurrentEpochStartShard = nextStartShard
 

beacon-chain/core/epoch/epoch_processing_test.go

@@ -293,7 +293,7 @@ func TestProcessFinalization(t *testing.T) {
 }
 
 func TestProcessCrosslinksOk(t *testing.T) {
-	state := buildState(5, 2*config.EpochLength)
+	state := buildState(5, config.DepositsForChainStart)
 	state.LatestCrosslinks = []*pb.CrosslinkRecord{{}, {}}
 
 	var attestations []*pb.PendingAttestationRecord
@@ -331,7 +331,7 @@ func TestProcessCrosslinksOk(t *testing.T) {
 }
 
 func TestProcessCrosslinksNoParticipantsBitField(t *testing.T) {
-	state := buildState(5, 2*config.EpochLength)
+	state := buildState(5, config.DepositsForChainStart)
 	state.LatestCrosslinks = []*pb.CrosslinkRecord{{}, {}}
 
 	attestations := []*pb.PendingAttestationRecord{
@@ -377,7 +377,7 @@ func TestProcessEjectionsOk(t *testing.T) {
 }
 
 func TestCanProcessValidatorRegistry(t *testing.T) {
-	crosslinks := make([]*pb.CrosslinkRecord, config.EpochLength)
+	crosslinks := make([]*pb.CrosslinkRecord, config.DepositsForChainStart)
 	for i := 0; i < len(crosslinks); i++ {
 		crosslinks[i] = &pb.CrosslinkRecord{
 			Slot: 101,

beacon-chain/core/helpers/BUILD.bazel

@@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "committee.go",
         "randao.go",
         "slot_epoch.go",
         "validators.go",
@@ -19,6 +20,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = [
+        "committee_test.go",
         "randao_test.go",
         "slot_epoch_test.go",
         "validators_test.go",