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

@@ -13,7 +13,6 @@ import (
"github.com/libp2p/go-libp2p-core/peer"
types "github.com/prysmaticlabs/eth2-types"
mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing"
coreTime "github.com/prysmaticlabs/prysm/beacon-chain/core/time"
"github.com/prysmaticlabs/prysm/beacon-chain/db"
dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers"
@@ -33,6 +32,7 @@ import (
"github.com/prysmaticlabs/prysm/testing/require"
"github.com/prysmaticlabs/prysm/testing/util"
prysmTime "github.com/prysmaticlabs/prysm/time"
"github.com/prysmaticlabs/prysm/time/slots"
"github.com/sirupsen/logrus"
)
@@ -110,7 +110,7 @@ func makeGenesisTime(currentSlot types.Slot) time.Time {
func TestMakeGenesisTime(t *testing.T) {
currentSlot := types.Slot(64)
gt := makeGenesisTime(currentSlot)
require.Equal(t, currentSlot, coreTime.SlotsSince(gt))
require.Equal(t, currentSlot, slots.Since(gt))
}
// helper function for sequences of block slots
@@ -320,7 +320,7 @@ func connectPeerHavingBlocks(
p.Connect(host)
finalizedEpoch := coreTime.SlotToEpoch(finalizedSlot)
finalizedEpoch := slots.ToEpoch(finalizedSlot)
headRoot, err := blocks[len(blocks)-1].Block.HashTreeRoot()
require.NoError(t, err)