Move Slot and Epoch functions from helpers to core pkg (#9519)

* Move Slot and Epoch functions from helpers to core

* limited viz

* goimports

* fix fuzz build

* fix fuzz build

* fix

* fix

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Preston Van Loon
2021-09-03 15:10:31 -05:00
committed by GitHub
parent 29b851a2b7
commit 4beb352e6f
189 changed files with 750 additions and 563 deletions

View File

@@ -35,7 +35,7 @@ import (
manet "github.com/multiformats/go-multiaddr/net"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/core"
"github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/peerdata"
"github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/scorers"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
@@ -649,7 +649,7 @@ func (p *Status) BestNonFinalized(minPeers int, ourHeadEpoch types.Epoch) (types
for _, pid := range connected {
peerChainState, err := p.ChainState(pid)
if err == nil && peerChainState != nil && peerChainState.HeadSlot > ourHeadSlot {
epoch := helpers.SlotToEpoch(peerChainState.HeadSlot)
epoch := core.SlotToEpoch(peerChainState.HeadSlot)
epochVotes[epoch]++
pidEpoch[pid] = epoch
pidHead[pid] = peerChainState.HeadSlot
@@ -755,7 +755,7 @@ func (p *Status) HighestEpoch() types.Epoch {
highestSlot = peerData.ChainState.HeadSlot
}
}
return helpers.SlotToEpoch(highestSlot)
return core.SlotToEpoch(highestSlot)
}
// ConnectedPeerLimit returns the peer limit of