From edd86fd358c3839c6798b2cb24688ea57a790cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= <rkapka@wp.pl>
Date: Fri, 5 Mar 2021 17:10:48 +0100
Subject: [PATCH] Simplify API beacon pool tests (#8564)

* fix comment of FarFutureEpoch

* remove not needed validator configuration
---
 beacon-chain/rpc/beaconv1/pool_test.go | 25 +++++++++----------------
 shared/params/config.go                |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/beacon-chain/rpc/beaconv1/pool_test.go b/beacon-chain/rpc/beaconv1/pool_test.go
index 17317650f123..a5fae4825055 100644
--- a/beacon-chain/rpc/beaconv1/pool_test.go
+++ b/beacon-chain/rpc/beaconv1/pool_test.go
@@ -207,9 +207,7 @@ func TestSubmitAttesterSlashing_Ok(t *testing.T) {
 	_, keys, err := testutil.DeterministicDepositsAndKeys(1)
 	require.NoError(t, err)
 	validator := &eth.Validator{
-		ExitEpoch:             params.BeaconConfig().FarFutureEpoch,
-		PublicKey:             keys[0].PublicKey().Marshal(),
-		WithdrawalCredentials: make([]byte, 32),
+		PublicKey: keys[0].PublicKey().Marshal(),
 	}
 	state, err := testutil.NewBeaconState(func(state *pb.BeaconState) {
 		state.Validators = []*eth.Validator{validator}
@@ -322,10 +320,8 @@ func TestSubmitProposerSlashing_Ok(t *testing.T) {
 	_, keys, err := testutil.DeterministicDepositsAndKeys(1)
 	require.NoError(t, err)
 	validator := &eth.Validator{
-		ExitEpoch:             params.BeaconConfig().FarFutureEpoch,
-		PublicKey:             keys[0].PublicKey().Marshal(),
-		WithdrawalCredentials: make([]byte, 32),
-		WithdrawableEpoch:     eth2types.Epoch(1),
+		PublicKey:         keys[0].PublicKey().Marshal(),
+		WithdrawableEpoch: eth2types.Epoch(1),
 	}
 	state, err := testutil.NewBeaconState(func(state *pb.BeaconState) {
 		state.Validators = []*eth.Validator{validator}
@@ -423,9 +419,8 @@ func TestSubmitVoluntaryExit_Ok(t *testing.T) {
 	_, keys, err := testutil.DeterministicDepositsAndKeys(1)
 	require.NoError(t, err)
 	validator := &eth.Validator{
-		ExitEpoch:             params.BeaconConfig().FarFutureEpoch,
-		PublicKey:             keys[0].PublicKey().Marshal(),
-		WithdrawalCredentials: make([]byte, 32),
+		ExitEpoch: params.BeaconConfig().FarFutureEpoch,
+		PublicKey: keys[0].PublicKey().Marshal(),
 	}
 	state, err := testutil.NewBeaconState(func(state *pb.BeaconState) {
 		state.Validators = []*eth.Validator{validator}
@@ -469,9 +464,8 @@ func TestSubmitVoluntaryExit_InvalidValidatorIndex(t *testing.T) {
 	_, keys, err := testutil.DeterministicDepositsAndKeys(1)
 	require.NoError(t, err)
 	validator := &eth.Validator{
-		ExitEpoch:             params.BeaconConfig().FarFutureEpoch,
-		PublicKey:             keys[0].PublicKey().Marshal(),
-		WithdrawalCredentials: make([]byte, 32),
+		ExitEpoch: params.BeaconConfig().FarFutureEpoch,
+		PublicKey: keys[0].PublicKey().Marshal(),
 	}
 	state, err := testutil.NewBeaconState(func(state *pb.BeaconState) {
 		state.Validators = []*eth.Validator{validator}
@@ -504,9 +498,8 @@ func TestSubmitVoluntaryExit_InvalidExit(t *testing.T) {
 	_, keys, err := testutil.DeterministicDepositsAndKeys(1)
 	require.NoError(t, err)
 	validator := &eth.Validator{
-		ExitEpoch:             params.BeaconConfig().FarFutureEpoch,
-		PublicKey:             keys[0].PublicKey().Marshal(),
-		WithdrawalCredentials: make([]byte, 32),
+		ExitEpoch: params.BeaconConfig().FarFutureEpoch,
+		PublicKey: keys[0].PublicKey().Marshal(),
 	}
 	state, err := testutil.NewBeaconState(func(state *pb.BeaconState) {
 		state.Validators = []*eth.Validator{validator}
diff --git a/shared/params/config.go b/shared/params/config.go
index e28a6a2c5a12..a32bab643bce 100644
--- a/shared/params/config.go
+++ b/shared/params/config.go
@@ -12,7 +12,7 @@ type BeaconChainConfig struct {
 	// Constants (non-configurable)
 	GenesisSlot              types.Slot  `yaml:"GENESIS_SLOT"`                // GenesisSlot represents the first canonical slot number of the beacon chain.
 	GenesisEpoch             types.Epoch `yaml:"GENESIS_EPOCH"`               // GenesisEpoch represents the first canonical epoch number of the beacon chain.
-	FarFutureEpoch           types.Epoch `yaml:"FAR_FUTURE_EPOCH"`            // FarFutureEpoch represents a epoch extremely far away in the future used as the default penalization slot for validators.
+	FarFutureEpoch           types.Epoch `yaml:"FAR_FUTURE_EPOCH"`            // FarFutureEpoch represents a epoch extremely far away in the future used as the default penalization epoch for validators.
 	FarFutureSlot            types.Slot  `yaml:"FAR_FUTURE_SLOT"`             // FarFutureSlot represents a slot extremely far away in the future.
 	BaseRewardsPerEpoch      uint64      `yaml:"BASE_REWARDS_PER_EPOCH"`      // BaseRewardsPerEpoch is used to calculate the per epoch rewards.
 	DepositContractTreeDepth uint64      `yaml:"DEPOSIT_CONTRACT_TREE_DEPTH"` // DepositContractTreeDepth depth of the Merkle trie of deposits in the validator deposit contract on the PoW chain.