github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move slot epoch from core to time pkg (#9714)

Browse Source 
* Move slot epoch from core to time pkg

* Fix fuzz

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
terence tsao
2021-09-30 12:00:14 -07:00
committed by GitHub
parent f5234634d6
commit 8219af46e4
200 changed files with 739 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon-chain/sync/initial-sync/service.go
View File

@@ -11,10 +11,10 @@ import (
"github.com/pkg/errors"
"github.com/prysmaticlabs/prysm/async/abool"
"github.com/prysmaticlabs/prysm/beacon-chain/blockchain"
"github.com/prysmaticlabs/prysm/beacon-chain/core"
"github.com/prysmaticlabs/prysm/beacon-chain/core/feed"
blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block"
statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
coreTime "github.com/prysmaticlabs/prysm/beacon-chain/core/time"
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/p2p"
"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
@@ -87,8 +87,8 @@ func (s *Service) Start() {
log.WithField("genesisTime", genesis).Info("Genesis time has not arrived - not syncing")
return
}
currentSlot := core.SlotsSince(genesis)
if core.SlotToEpoch(currentSlot) == 0 {
currentSlot := coreTime.SlotsSince(genesis)
if coreTime.SlotToEpoch(currentSlot) == 0 {
log.WithField("genesisTime", genesis).Info("Chain started within the last epoch - not syncing")
s.markSynced(genesis)
return
@@ -96,7 +96,7 @@ func (s *Service) Start() {
s.chainStarted.Set()
log.Info("Starting initial chain sync...")
// Are we already in sync, or close to it?
if core.SlotToEpoch(s.cfg.Chain.HeadSlot()) == core.SlotToEpoch(currentSlot) {
if coreTime.SlotToEpoch(s.cfg.Chain.HeadSlot()) == coreTime.SlotToEpoch(currentSlot) {
log.Info("Already synced to the current chain head")
s.markSynced(genesis)
return