AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 21:38:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up state types (#11916)

Browse Source 
* Clean up state types

* rename package
This commit is contained in:
Radosław Kapka
2023-01-26 15:40:12 +01:00
committed by GitHub
parent a296a0c783
commit 77d3ccb9ad
555 changed files with 4696 additions and 4958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
beacon-chain/sync/initial-sync/initial_sync_test.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/prysmaticlabs/prysm/v3/config/features"
"github.com/prysmaticlabs/prysm/v3/config/params"
"github.com/prysmaticlabs/prysm/v3/consensus-types/blocks"
types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives"
"github.com/prysmaticlabs/prysm/v3/container/slice"
"github.com/prysmaticlabs/prysm/v3/crypto/hash"
"github.com/prysmaticlabs/prysm/v3/encoding/bytesutil"
@@ -37,17 +37,17 @@ import (
type testCache struct {
sync.RWMutex
rootCache map[types.Slot][32]byte
parentSlotCache map[types.Slot]types.Slot
rootCache map[primitives.Slot][32]byte
parentSlotCache map[primitives.Slot]primitives.Slot
}
var cache = &testCache{}
type peerData struct {
blocks []types.Slot // slots that peer has blocks
finalizedEpoch types.Epoch
headSlot types.Slot
failureSlots []types.Slot // slots at which the peer will return an error
blocks []primitives.Slot // slots that peer has blocks
finalizedEpoch primitives.Epoch
headSlot primitives.Slot
failureSlots []primitives.Slot // slots at which the peer will return an error
forkedPeer bool
}
@@ -72,7 +72,7 @@ func TestMain(m *testing.M) {
m.Run()
}
func initializeTestServices(t *testing.T, slots []types.Slot, peers []*peerData) (*mock.ChainService, *p2pt.TestP2P, db.Database) {
func initializeTestServices(t *testing.T, slots []primitives.Slot, peers []*peerData) (*mock.ChainService, *p2pt.TestP2P, db.Database) {
cache.initializeRootCache(slots, t)
beaconDB := dbtest.SetupDB(t)
@@ -100,36 +100,36 @@ func initializeTestServices(t *testing.T, slots []types.Slot, peers []*peerData)
}
// makeGenesisTime where now is the current slot.
func makeGenesisTime(currentSlot types.Slot) time.Time {
func makeGenesisTime(currentSlot primitives.Slot) time.Time {
return prysmTime.Now().Add(-1 * time.Second * time.Duration(currentSlot) * time.Duration(params.BeaconConfig().SecondsPerSlot))
}
// sanity test on helper function
func TestMakeGenesisTime(t *testing.T) {
currentSlot := types.Slot(64)
currentSlot := primitives.Slot(64)
gt := makeGenesisTime(currentSlot)
require.Equal(t, currentSlot, slots.Since(gt))
}
// helper function for sequences of block slots
func makeSequence(start, end types.Slot) []types.Slot {
func makeSequence(start, end primitives.Slot) []primitives.Slot {
if end < start {
panic("cannot make sequence where end is before start")
}
seq := make([]types.Slot, 0, end-start+1)
seq := make([]primitives.Slot, 0, end-start+1)
for i := start; i <= end; i++ {
seq = append(seq, i)
}
return seq
}
func (c *testCache) initializeRootCache(reqSlots []types.Slot, t *testing.T) {
func (c *testCache) initializeRootCache(reqSlots []primitives.Slot, t *testing.T) {
c.Lock()
defer c.Unlock()
c.rootCache = make(map[types.Slot][32]byte)
c.parentSlotCache = make(map[types.Slot]types.Slot)
parentSlot := types.Slot(0)
c.rootCache = make(map[primitives.Slot][32]byte)
c.parentSlotCache = make(map[primitives.Slot]primitives.Slot)
parentSlot := primitives.Slot(0)
genesisBlock := util.NewBeaconBlock().Block
genesisRoot, err := genesisBlock.HashTreeRoot()
@@ -151,7 +151,7 @@ func (c *testCache) initializeRootCache(reqSlots []types.Slot, t *testing.T) {
// sanity test on helper function
func TestMakeSequence(t *testing.T) {
got := makeSequence(3, 5)
want := []types.Slot{3, 4, 5}
want := []primitives.Slot{3, 4, 5}
require.DeepEqual(t, want, got)
}
@@ -257,7 +257,7 @@ func extendBlockSequence(t *testing.T, inSeq []*ethpb.SignedBeaconBlock, size in
// Extend block chain sequentially.
for slot := startSlot; slot < len(outSeq); slot++ {
outSeq[slot] = util.NewBeaconBlock()
outSeq[slot].Block.Slot = types.Slot(slot)
outSeq[slot].Block.Slot = primitives.Slot(slot)
parentRoot, err := outSeq[slot-1].Block.HashTreeRoot()
require.NoError(t, err)
outSeq[slot].Block.ParentRoot = parentRoot[:]
@@ -271,7 +271,7 @@ func extendBlockSequence(t *testing.T, inSeq []*ethpb.SignedBeaconBlock, size in
// connectPeerHavingBlocks connect host with a peer having provided blocks.
func connectPeerHavingBlocks(
t *testing.T, host *p2pt.TestP2P, blks []*ethpb.SignedBeaconBlock, finalizedSlot types.Slot,
t *testing.T, host *p2pt.TestP2P, blks []*ethpb.SignedBeaconBlock, finalizedSlot primitives.Slot,
peerStatus *peers.Status,
) peer.ID {
p := p2pt.NewTestP2P(t)
@@ -285,7 +285,7 @@ func connectPeerHavingBlocks(
req := &ethpb.BeaconBlocksByRangeRequest{}
assert.NoError(t, p.Encoding().DecodeWithMaxLength(stream, req))
for i := req.StartSlot; i < req.StartSlot.Add(req.Count*req.Step); i += types.Slot(req.Step) {
for i := req.StartSlot; i < req.StartSlot.Add(req.Count*req.Step); i += primitives.Slot(req.Step) {
if uint64(i) >= uint64(len(blks)) {
break
}