Refactor: move functions beacon-chain/core/time -> time/slots (#9719)

* Move necessary functions beacon-chain/core/time -> time/slots

* Fix fuzz

* Fix build

* Update slot_epoch.go
This commit is contained in:
terence tsao
2021-10-01 13:17:57 -07:00
committed by GitHub
parent 4f31ba6489
commit c21e43e4c5
163 changed files with 739 additions and 720 deletions

View File

@@ -7,10 +7,10 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//beacon-chain/core/signing:go_default_library",
"//beacon-chain/core/time:go_default_library",
"//config/params:go_default_library",
"//encoding/bytesutil:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//time/slots:go_default_library",
"@com_github_pkg_errors//:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",
],

View File

@@ -9,10 +9,10 @@ import (
"github.com/pkg/errors"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/signing"
coreTime "github.com/prysmaticlabs/prysm/beacon-chain/core/time"
"github.com/prysmaticlabs/prysm/config/params"
"github.com/prysmaticlabs/prysm/encoding/bytesutil"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/time/slots"
)
// IsForkNextEpoch checks if an alloted fork is in the following epoch.
@@ -23,8 +23,8 @@ func IsForkNextEpoch(genesisTime time.Time, genesisValidatorsRoot []byte) (bool,
if len(genesisValidatorsRoot) == 0 {
return false, errors.New("genesis validators root is not set")
}
currentSlot := coreTime.SlotsSince(genesisTime)
currentEpoch := coreTime.SlotToEpoch(currentSlot)
currentSlot := slots.Since(genesisTime)
currentEpoch := slots.ToEpoch(currentSlot)
fSchedule := params.BeaconConfig().ForkVersionSchedule
scheduledForks := SortedForkVersions(fSchedule)
isForkEpoch := false
@@ -64,8 +64,8 @@ func CreateForkDigest(
if len(genesisValidatorsRoot) == 0 {
return [4]byte{}, errors.New("genesis validators root is not set")
}
currentSlot := coreTime.SlotsSince(genesisTime)
currentEpoch := coreTime.SlotToEpoch(currentSlot)
currentSlot := slots.Since(genesisTime)
currentEpoch := slots.ToEpoch(currentSlot)
forkData, err := Fork(currentEpoch)
if err != nil {