Fix typos and inconsistencies (#4453)

* Fix typos and inconsistencies

* igoimports

* Gazelle

README.md

@@ -23,7 +23,7 @@ Participation is now open to the public for our Ethereum 2.0 phase 0 testnet rel
     - [Running via Docker](#running-via-docker)
     - [Running via Bazel](#running-via-bazel)
 - [Staking ETH: running a validator client](#staking-eth-running-a-validator-client)
-    - [Activating your validator: depositing 3.2 Goerli ETH](#activating-your-validator-depositing-32-göerli-eth)
+    - [Activating your validator: depositing 3.2 Goerli ETH](#activating-your-validator-depositing-32-gerli-eth)
     - [Starting the validator with Bazel](#starting-the-validator-with-bazel)
 - [Setting up a local ETH2 development chain](#setting-up-a-local-eth2-development-chain)
     - [Installation and dependencies](#installation-and-dependencies) 

beacon-chain/blockchain/forkchoice/service_test.go

@@ -329,7 +329,7 @@ func TestStore_GetHead(t *testing.T) {
 	// 18 validators switches vote to B1 to gain 51%, enough to switch head
 	for i := 0; i < 18; i++ {
 		idx := 50 + uint64(i)
-		store.latestVoteMap[uint64(idx)] = &pb.ValidatorLatestVote{Root: roots[1]}
+		store.latestVoteMap[idx] = &pb.ValidatorLatestVote{Root: roots[1]}
 	}
 	head, err = store.Head(ctx)
 	if err != nil {

beacon-chain/cache/eth1_data_test.go

@@ -91,7 +91,7 @@ func TestEth1Data_MaxSize(t *testing.T) {
 
 	for i := 0; i < maxEth1DataVoteSize+1; i++ {
 		var hash [32]byte
-		copy(hash[:], []byte(strconv.Itoa(i)))
+		copy(hash[:], strconv.Itoa(i))
 		eInfo := &Eth1DataVote{
 			Eth1DataHash: hash,
 		}

beacon-chain/core/epoch/epoch_processing_test.go

@@ -323,8 +323,8 @@ func TestProcessRegistryUpdates_NoRotation(t *testing.T) {
 	state := &pb.BeaconState{
 		Slot: 5 * params.BeaconConfig().SlotsPerEpoch,
 		Validators: []*ethpb.Validator{
-			{ExitEpoch: params.BeaconConfig().MaxSeedLookhead},
-			{ExitEpoch: params.BeaconConfig().MaxSeedLookhead},
+			{ExitEpoch: params.BeaconConfig().MaxSeedLookahead},
+			{ExitEpoch: params.BeaconConfig().MaxSeedLookahead},
 		},
 		Balances: []uint64{
 			params.BeaconConfig().MaxEffectiveBalance,
@@ -337,9 +337,9 @@ func TestProcessRegistryUpdates_NoRotation(t *testing.T) {
 		t.Fatal(err)
 	}
 	for i, validator := range newState.Validators {
-		if validator.ExitEpoch != params.BeaconConfig().MaxSeedLookhead {
+		if validator.ExitEpoch != params.BeaconConfig().MaxSeedLookahead {
 			t.Errorf("Could not update registry %d, wanted exit slot %d got %d",
-				i, params.BeaconConfig().MaxSeedLookhead, validator.ExitEpoch)
+				i, params.BeaconConfig().MaxSeedLookahead, validator.ExitEpoch)
 		}
 	}
 }
@@ -385,10 +385,10 @@ func TestProcessRegistryUpdates_ActivationCompletes(t *testing.T) {
 	state := &pb.BeaconState{
 		Slot: 5 * params.BeaconConfig().SlotsPerEpoch,
 		Validators: []*ethpb.Validator{
-			{ExitEpoch: params.BeaconConfig().MaxSeedLookhead,
-				ActivationEpoch: 5 + params.BeaconConfig().MaxSeedLookhead + 1},
-			{ExitEpoch: params.BeaconConfig().MaxSeedLookhead,
-				ActivationEpoch: 5 + params.BeaconConfig().MaxSeedLookhead + 1},
+			{ExitEpoch: params.BeaconConfig().MaxSeedLookahead,
+				ActivationEpoch: 5 + params.BeaconConfig().MaxSeedLookahead + 1},
+			{ExitEpoch: params.BeaconConfig().MaxSeedLookahead,
+				ActivationEpoch: 5 + params.BeaconConfig().MaxSeedLookahead + 1},
 		},
 		FinalizedCheckpoint: &ethpb.Checkpoint{},
 	}
@@ -397,9 +397,9 @@ func TestProcessRegistryUpdates_ActivationCompletes(t *testing.T) {
 		t.Error(err)
 	}
 	for i, validator := range newState.Validators {
-		if validator.ExitEpoch != params.BeaconConfig().MaxSeedLookhead {
+		if validator.ExitEpoch != params.BeaconConfig().MaxSeedLookahead {
 			t.Errorf("Could not update registry %d, wanted exit slot %d got %d",
-				i, params.BeaconConfig().MaxSeedLookhead, validator.ExitEpoch)
+				i, params.BeaconConfig().MaxSeedLookahead, validator.ExitEpoch)
 		}
 	}
 }
@@ -424,9 +424,9 @@ func TestProcessRegistryUpdates_ValidatorsEjected(t *testing.T) {
 		t.Error(err)
 	}
 	for i, validator := range newState.Validators {
-		if validator.ExitEpoch != params.BeaconConfig().MaxSeedLookhead+1 {
+		if validator.ExitEpoch != params.BeaconConfig().MaxSeedLookahead+1 {
 			t.Errorf("Could not update registry %d, wanted exit slot %d got %d",
-				i, params.BeaconConfig().MaxSeedLookhead+1, validator.ExitEpoch)
+				i, params.BeaconConfig().MaxSeedLookahead+1, validator.ExitEpoch)
 		}
 	}
 }

beacon-chain/core/helpers/randao.go

@@ -1,17 +1,12 @@
 package helpers
 
 import (
-	"github.com/pkg/errors"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/hashutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 
-// ErrInvalidStateLatestActiveIndexRoots is returned when the state active
-// index root count does not match the expected EpochsPerHistoricalVector.
-var ErrInvalidStateLatestActiveIndexRoots = errors.New("state does not have correct number of latest active index roots")
-
 // Seed returns the randao seed used for shuffling of a given epoch.
 //
 // Spec pseudocode definition:

beacon-chain/core/helpers/validators.go

@@ -110,7 +110,7 @@ func ActiveValidatorCount(state *pb.BeaconState, epoch uint64) (uint64, error) {
 //    """
 //    return Epoch(epoch + 1 + ACTIVATION_EXIT_DELAY)
 func DelayedActivationExitEpoch(epoch uint64) uint64 {
-	return epoch + 1 + params.BeaconConfig().MaxSeedLookhead
+	return epoch + 1 + params.BeaconConfig().MaxSeedLookahead
 }
 
 // ValidatorChurnLimit returns the number of validators that are allowed to

beacon-chain/core/helpers/validators_test.go

@@ -178,7 +178,7 @@ func TestBeaconProposerIndex_OK(t *testing.T) {
 func TestDelayedActivationExitEpoch_OK(t *testing.T) {
 	epoch := uint64(9999)
 	got := DelayedActivationExitEpoch(epoch)
-	wanted := epoch + 1 + params.BeaconConfig().MaxSeedLookhead
+	wanted := epoch + 1 + params.BeaconConfig().MaxSeedLookahead
 	if wanted != got {
 		t.Errorf("Wanted: %d, received: %d", wanted, got)
 	}

beacon-chain/db/kv/finalized_block_roots.go

@@ -37,7 +37,7 @@ var containerFinalizedButNotCanonical = []byte("recent block needs reindexing to
 //
 // This method ensures that all blocks from the current finalized epoch are considered "final" while
 // maintaining only canonical and finalized blocks older than the current finalized epoch.
-func (kv *Store) updateFinalizedBlockRoots(ctx context.Context, tx *bolt.Tx, checkpoint *ethpb.Checkpoint) error {
+func (k *Store) updateFinalizedBlockRoots(ctx context.Context, tx *bolt.Tx, checkpoint *ethpb.Checkpoint) error {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.updateFinalizedBlockRoots")
 	defer span.End()
 
@@ -48,15 +48,15 @@ func (kv *Store) updateFinalizedBlockRoots(ctx context.Context, tx *bolt.Tx, che
 	genesisRoot := tx.Bucket(blocksBucket).Get(genesisBlockRootKey)
 
 	// De-index recent finalized block roots, to be re-indexed.
-	prevousFinalizedCheckpoint := &ethpb.Checkpoint{}
+	previousFinalizedCheckpoint := &ethpb.Checkpoint{}
 	if b := bkt.Get(previousFinalizedCheckpointKey); b != nil {
-		if err := decode(b, prevousFinalizedCheckpoint); err != nil {
+		if err := decode(b, previousFinalizedCheckpoint); err != nil {
 			traceutil.AnnotateError(span, err)
 			return err
 		}
 	}
-	blockRoots, err := kv.BlockRoots(ctx, filters.NewFilter().
-		SetStartEpoch(prevousFinalizedCheckpoint.Epoch).
+	blockRoots, err := k.BlockRoots(ctx, filters.NewFilter().
+		SetStartEpoch(previousFinalizedCheckpoint.Epoch).
 		SetEndEpoch(checkpoint.Epoch+1),
 	)
 	if err != nil {
@@ -77,7 +77,7 @@ func (kv *Store) updateFinalizedBlockRoots(ctx context.Context, tx *bolt.Tx, che
 			break
 		}
 
-		signedBlock, err := kv.Block(ctx, bytesutil.ToBytes32(root))
+		signedBlock, err := k.Block(ctx, bytesutil.ToBytes32(root))
 		if err != nil {
 			traceutil.AnnotateError(span, err)
 			return err
@@ -128,7 +128,7 @@ func (kv *Store) updateFinalizedBlockRoots(ctx context.Context, tx *bolt.Tx, che
 	}
 
 	// Upsert blocks from the current finalized epoch.
-	roots, err := kv.BlockRoots(ctx, filters.NewFilter().SetStartEpoch(checkpoint.Epoch).SetEndEpoch(checkpoint.Epoch+1))
+	roots, err := k.BlockRoots(ctx, filters.NewFilter().SetStartEpoch(checkpoint.Epoch).SetEndEpoch(checkpoint.Epoch+1))
 	if err != nil {
 		traceutil.AnnotateError(span, err)
 		return err
@@ -158,12 +158,12 @@ func (kv *Store) updateFinalizedBlockRoots(ctx context.Context, tx *bolt.Tx, che
 // A beacon block root contained exists in this index if it is considered finalized and canonical.
 // Note: beacon blocks from the latest finalized epoch return true, whether or not they are
 // considered canonical in the "head view" of the beacon node.
-func (kv *Store) IsFinalizedBlock(ctx context.Context, blockRoot [32]byte) bool {
+func (k *Store) IsFinalizedBlock(ctx context.Context, blockRoot [32]byte) bool {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.IsFinalizedBlock")
 	defer span.End()
 
 	var exists bool
-	err := kv.db.View(func(tx *bolt.Tx) error {
+	err := k.db.View(func(tx *bolt.Tx) error {
 		exists = tx.Bucket(finalizedBlockRootsIndexBucket).Get(blockRoot[:]) != nil
 		return nil
 	})

beacon-chain/db/kv/prune_states.go

@@ -12,10 +12,10 @@ import (
 
 var pruneStatesKey = []byte("prune-states")
 
-func (kv *Store) pruneStates(ctx context.Context) error {
+func (k *Store) pruneStates(ctx context.Context) error {
 	var pruned bool
 
-	kv.db.View(func(tx *bolt.Tx) error {
+	k.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(migrationBucket)
 		v := bkt.Get(pruneStatesKey)
 		pruned = len(v) == 1 && v[0] == 0x01
@@ -29,16 +29,16 @@ func (kv *Store) pruneStates(ctx context.Context) error {
 	log := logrus.WithField("prefix", "kv")
 	log.Info("Pruning states before last finalized check point. This might take a while...")
 
-	roots, err := kv.rootsToPrune(ctx)
+	roots, err := k.rootsToPrune(ctx)
 	if err != nil {
 		return err
 	}
 
-	if err := kv.DeleteStates(ctx, roots); err != nil {
+	if err := k.DeleteStates(ctx, roots); err != nil {
 		return err
 	}
 
-	return kv.db.Update(func(tx *bolt.Tx) error {
+	return k.db.Update(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(migrationBucket)
 		return bkt.Put(pruneStatesKey, []byte{0x01})
 	})
@@ -48,13 +48,13 @@ func (kv *Store) pruneStates(ctx context.Context) error {
 // * Get last finalized check point
 // * Rewind end slot until it's not finalized root
 // * return roots between slot 1 and end slot
-func (kv *Store) rootsToPrune(ctx context.Context) ([][32]byte, error) {
-	cp, err := kv.FinalizedCheckpoint(ctx)
+func (k *Store) rootsToPrune(ctx context.Context) ([][32]byte, error) {
+	cp, err := k.FinalizedCheckpoint(ctx)
 	if err != nil {
 		return nil, err
 	}
 	f := filters.NewFilter().SetStartSlot(1).SetEndSlot(helpers.StartSlot(cp.Epoch))
-	roots, err := kv.BlockRoots(ctx, f)
+	roots, err := k.BlockRoots(ctx, f)
 	if err != nil {
 		return nil, err
 	}

beacon-chain/p2p/connmgr/connmgr.go

@@ -84,7 +84,7 @@ type segment struct {
 type segments [256]*segment
 
 func (ss *segments) get(p peer.ID) *segment {
-	return ss[byte(p[len(p)-1])]
+	return ss[p[len(p)-1]]
 }
 
 func (ss *segments) countPeers() (count int) {

beacon-chain/p2p/connmgr/connmgr_test.go

@@ -103,7 +103,7 @@ func TestConnsToClose(t *testing.T) {
 		t.Fatal("expected no connections")
 	}
 
-	cm = NewConnManager(1, 1, time.Duration(10*time.Minute))
+	cm = NewConnManager(1, 1, 10*time.Minute)
 	not := cm.Notifee()
 	for i := 0; i < 5; i++ {
 		conn := randConn(t, nil)
@@ -117,7 +117,7 @@ func TestConnsToClose(t *testing.T) {
 
 func TestGetTagInfo(t *testing.T) {
 	start := time.Now()
-	cm := NewConnManager(1, 1, time.Duration(10*time.Minute))
+	cm := NewConnManager(1, 1, 10*time.Minute)
 	not := cm.Notifee()
 	conn := randConn(t, nil)
 	not.Connected(nil, conn)
@@ -187,7 +187,7 @@ func TestGetTagInfo(t *testing.T) {
 }
 
 func TestTagPeerNonExistant(t *testing.T) {
-	cm := NewConnManager(1, 1, time.Duration(10*time.Minute))
+	cm := NewConnManager(1, 1, 10*time.Minute)
 
 	id := tu.RandPeerIDFatal(t)
 	cm.TagPeer(id, "test", 1)
@@ -198,7 +198,7 @@ func TestTagPeerNonExistant(t *testing.T) {
 }
 
 func TestUntagPeer(t *testing.T) {
-	cm := NewConnManager(1, 1, time.Duration(10*time.Minute))
+	cm := NewConnManager(1, 1, 10*time.Minute)
 	not := cm.Notifee()
 	conn := randConn(t, nil)
 	not.Connected(nil, conn)
@@ -228,7 +228,7 @@ func TestUntagPeer(t *testing.T) {
 
 func TestGetInfo(t *testing.T) {
 	start := time.Now()
-	gp := time.Duration(10 * time.Minute)
+	gp := 10 * time.Minute
 	cm := NewConnManager(1, 5, gp)
 	not := cm.Notifee()
 	conn := randConn(t, nil)
@@ -255,7 +255,7 @@ func TestGetInfo(t *testing.T) {
 }
 
 func TestDoubleConnection(t *testing.T) {
-	gp := time.Duration(10 * time.Minute)
+	gp := 10 * time.Minute
 	cm := NewConnManager(1, 5, gp)
 	not := cm.Notifee()
 	conn := randConn(t, nil)
@@ -271,7 +271,7 @@ func TestDoubleConnection(t *testing.T) {
 }
 
 func TestDisconnected(t *testing.T) {
-	gp := time.Duration(10 * time.Minute)
+	gp := 10 * time.Minute
 	cm := NewConnManager(1, 5, gp)
 	not := cm.Notifee()
 	conn := randConn(t, nil)
@@ -605,7 +605,7 @@ func TestPeerProtectionIdempotent(t *testing.T) {
 }
 
 func TestUpsertTag(t *testing.T) {
-	cm := NewConnManager(1, 1, time.Duration(10*time.Minute))
+	cm := NewConnManager(1, 1, 10*time.Minute)
 	not := cm.Notifee()
 	conn := randConn(t, nil)
 	rp := conn.RemotePeer()

beacon-chain/p2p/discovery_test.go

@@ -55,7 +55,7 @@ func TestCreateListener(t *testing.T) {
 		t.Errorf("Ip address is not the expected type, wanted %s but got %s", ipAddr.String(), listener.Self().IP().String())
 	}
 
-	if port != int(listener.Self().UDP()) {
+	if port != listener.Self().UDP() {
 		t.Errorf("In correct port number, wanted %d but got %d", port, listener.Self().UDP())
 	}
 	pubkey := listener.Self().Pubkey()

beacon-chain/p2p/service.go

@@ -30,7 +30,6 @@ import (
 var _ = shared.Service(&Service{})
 
 var pollingPeriod = 1 * time.Second
-var ttl = 1 * time.Hour
 
 const prysmProtocolPrefix = "/prysm/0.0.0"
 
@@ -94,7 +93,7 @@ func NewService(cfg *Config) (*Service, error) {
 		dopts := []dhtopts.Option{
 			dhtopts.Datastore(dsync.MutexWrap(ds.NewMapDatastore())),
 			dhtopts.Protocols(
-				protocol.ID(prysmProtocolPrefix + "/dht"),
+				prysmProtocolPrefix + "/dht",
 			),
 		}
 
@@ -189,7 +188,7 @@ func (s *Service) Start() {
 			s.host.ConnManager().Protect(peer.ID, "bootnode")
 		}
 		bcfg := kaddht.DefaultBootstrapConfig
-		bcfg.Period = time.Duration(30 * time.Second)
+		bcfg.Period = 30 * time.Second
 		if err := s.dht.BootstrapWithConfig(s.ctx, bcfg); err != nil {
 			log.WithError(err).Error("Failed to bootstrap DHT")
 		}

beacon-chain/powchain/deposit_test.go

@@ -108,7 +108,7 @@ func TestProcessDeposit_InvalidPublicKey(t *testing.T) {
 	if err != nil {
 		log.Error(err)
 	}
-	deposits[0].Proof, err = trie.MerkleProof((0))
+	deposits[0].Proof, err = trie.MerkleProof(0)
 	if err != nil {
 		t.Fatal(err)
 	}

beacon-chain/rpc/beacon/validators.go

@@ -591,6 +591,6 @@ func (bs *Server) GetValidatorPerformance(
 		AverageActiveValidatorBalance: avgBalance,
 		MissingValidators:             missingValidators,
 		TotalValidators:               uint64(len(headState.Validators)),
-		TotalActiveValidators:         uint64(activeCount),
+		TotalActiveValidators:         activeCount,
 	}, nil
 }

beacon-chain/rpc/validator/proposer.go

@@ -64,7 +64,7 @@ func (vs *Server) GetBlock(ctx context.Context, req *ethpb.BlockRequest) (*ethpb
 	// Use zero hash as stub for state root to compute later.
 	stateRoot := params.BeaconConfig().ZeroHash[:]
 
-	graffiti := bytesutil.ToBytes32([]byte(req.Graffiti))
+	graffiti := bytesutil.ToBytes32(req.Graffiti)
 
 	blk := &ethpb.BeaconBlock{
 		Slot:       req.Slot,

beacon-chain/sync/BUILD.bazel

@@ -117,7 +117,6 @@ go_test(
         "@com_github_gogo_protobuf//proto:go_default_library",
         "@com_github_libp2p_go_libp2p_core//:go_default_library",
         "@com_github_libp2p_go_libp2p_core//network:go_default_library",
-        "@com_github_libp2p_go_libp2p_core//peer:go_default_library",
         "@com_github_libp2p_go_libp2p_core//protocol:go_default_library",
         "@com_github_libp2p_go_libp2p_pubsub//:go_default_library",
         "@com_github_libp2p_go_libp2p_pubsub//pb:go_default_library",

beacon-chain/sync/error.go

@@ -43,5 +43,5 @@ func ReadStatusCode(stream io.Reader, encoding encoder.NetworkEncoding) (uint8,
 		return 0, "", err
 	}
 
-	return uint8(b[0]), string(msg), nil
+	return b[0], string(msg), nil
 }