mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 23:48:06 -05:00
Update fastssz (#6760)
* Update fastssz * Merge branch 'master' of github.com:prysmaticlabs/prysm into update-fssz * fmt * gaz * Merge refs/heads/master into update-fssz * goimports * Merge refs/heads/master into update-fssz * Merge refs/heads/master into update-fssz * Merge refs/heads/master into update-fssz * Merge refs/heads/master into update-fssz * Merge refs/heads/master into update-fssz * Fix * fix ethereumapis * fix again * kafka * fix gen file * fix compute signing root * gofmt * checkpoint progress * progress * checkpoint * progress * Fix build * checkpoint * helpers * Another test fixed * gaz * another test fix * gofmt * some fixes * Merge branch 'master' of github.com:prysmaticlabs/prysm into update-fssz * fix one test * Merge branch 'master' of github.com:prysmaticlabs/prysm into update-fssz * fill empty checkpoint roots * more padding * more padding * Fix //beacon-chain/rpc/debug:go_default_test * fix //beacon-chain/core/state:go_default_test * fix //beacon-chain/core/state:go_default_test * fix some htr errors * fix //slasher/rpc:go_default_test * Progress on //beacon-chain/core/blocks:go_default_test * Progress on //beacon-chain/core/blocks:go_default_test * Progress on //beacon-chain/core/blocks:go_default_test * fix //slasher/db/kv:go_default_test * progress * fix //beacon-chain/sync/initial-sync:go_raceon_test * gofmt and gaz * fix one more test, taking a break * Fix //beacon-chain/core/blocks:go_default_test * Complete beacon-chain/powchain * Do most of beacon-chain/rpc/beacon/ * Do most of beacon-chain/blockchain * fix //beacon-chain/operations/attestations/kv:go_default_test * Fix //beacon-chain/cache/depositcache:go_default_test * Fix //slasher/detection:go_default_test * Progress * fix //beacon-chain/rpc/validator:go_default_test * gofmt * fix //validator/client:go_default_test * fix * fix //beacon-chain/blockchain:go_raceoff_test * fix //beacon-chain/rpc/beacon:go_default_test * fix 1 of 4 shards in //beacon-chain/sync:go_default_test * Fix //beacon-chain/sync:go_default_test and gofmt * prevent panic * fix //beacon-chain/state/stategen:go_default_test * fix * Merge branch 'master' of github.com:prysmaticlabs/prysm into update-fssz * fix most tests * Self review, go mod tidy, run regen scripts * fix slasher * Update ethereumapis * disable spawn strategy override * Merge refs/heads/master into update-fssz * Merge refs/heads/master into update-fssz * Remove extra line in imports * Remove extra line in imports * Gofmt * PR feedback from @nisdas
This commit is contained in:
@@ -10,11 +10,10 @@ import (
|
||||
dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
|
||||
"github.com/prysmaticlabs/prysm/beacon-chain/flags"
|
||||
p2pt "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing"
|
||||
stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state"
|
||||
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
|
||||
p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
|
||||
"github.com/prysmaticlabs/prysm/shared/params"
|
||||
"github.com/prysmaticlabs/prysm/shared/sliceutil"
|
||||
"github.com/prysmaticlabs/prysm/shared/testutil"
|
||||
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
|
||||
"github.com/prysmaticlabs/prysm/shared/testutil/require"
|
||||
)
|
||||
@@ -287,11 +286,10 @@ func TestService_roundRobinSync(t *testing.T) {
|
||||
genesisRoot := cache.rootCache[0]
|
||||
cache.RUnlock()
|
||||
|
||||
err := beaconDB.SaveBlock(context.Background(), ð.SignedBeaconBlock{Block: ð.BeaconBlock{Slot: 0}})
|
||||
err := beaconDB.SaveBlock(context.Background(), testutil.NewBeaconBlock())
|
||||
require.NoError(t, err)
|
||||
|
||||
st, err := stateTrie.InitializeFromProto(&p2ppb.BeaconState{})
|
||||
require.NoError(t, err)
|
||||
st := testutil.NewBeaconState()
|
||||
mc := &mock.ChainService{
|
||||
State: st,
|
||||
Root: genesisRoot[:],
|
||||
@@ -326,15 +324,12 @@ func TestService_roundRobinSync(t *testing.T) {
|
||||
|
||||
func TestService_processBlock(t *testing.T) {
|
||||
beaconDB, _ := dbtest.SetupDB(t)
|
||||
genesisBlk := ð.BeaconBlock{
|
||||
Slot: 0,
|
||||
}
|
||||
genesisBlkRoot, err := stateutil.BlockRoot(genesisBlk)
|
||||
genesisBlk := testutil.NewBeaconBlock()
|
||||
genesisBlkRoot, err := stateutil.BlockRoot(genesisBlk.Block)
|
||||
require.NoError(t, err)
|
||||
err = beaconDB.SaveBlock(context.Background(), ð.SignedBeaconBlock{Block: genesisBlk})
|
||||
require.NoError(t, err)
|
||||
st, err := stateTrie.InitializeFromProto(&p2ppb.BeaconState{})
|
||||
err = beaconDB.SaveBlock(context.Background(), genesisBlk)
|
||||
require.NoError(t, err)
|
||||
st := testutil.NewBeaconState()
|
||||
s := NewInitialSync(&Config{
|
||||
P2P: p2pt.NewTestP2P(t),
|
||||
DB: beaconDB,
|
||||
@@ -351,20 +346,14 @@ func TestService_processBlock(t *testing.T) {
|
||||
genesis := makeGenesisTime(32)
|
||||
|
||||
t.Run("process duplicate block", func(t *testing.T) {
|
||||
blk1 := ð.SignedBeaconBlock{
|
||||
Block: ð.BeaconBlock{
|
||||
Slot: 1,
|
||||
ParentRoot: genesisBlkRoot[:],
|
||||
},
|
||||
}
|
||||
blk1 := testutil.NewBeaconBlock()
|
||||
blk1.Block.Slot = 1
|
||||
blk1.Block.ParentRoot = genesisBlkRoot[:]
|
||||
blk1Root, err := stateutil.BlockRoot(blk1.Block)
|
||||
require.NoError(t, err)
|
||||
blk2 := ð.SignedBeaconBlock{
|
||||
Block: ð.BeaconBlock{
|
||||
Slot: 2,
|
||||
ParentRoot: blk1Root[:],
|
||||
},
|
||||
}
|
||||
blk2 := testutil.NewBeaconBlock()
|
||||
blk2.Block.Slot = 2
|
||||
blk2.Block.ParentRoot = blk1Root[:]
|
||||
|
||||
// Process block normally.
|
||||
err = s.processBlock(ctx, genesis, blk1, func(
|
||||
@@ -394,15 +383,12 @@ func TestService_processBlock(t *testing.T) {
|
||||
|
||||
func TestService_processBlockBatch(t *testing.T) {
|
||||
beaconDB, _ := dbtest.SetupDB(t)
|
||||
genesisBlk := ð.BeaconBlock{
|
||||
Slot: 0,
|
||||
}
|
||||
genesisBlkRoot, err := stateutil.BlockRoot(genesisBlk)
|
||||
genesisBlk := testutil.NewBeaconBlock()
|
||||
genesisBlkRoot, err := stateutil.BlockRoot(genesisBlk.Block)
|
||||
require.NoError(t, err)
|
||||
err = beaconDB.SaveBlock(context.Background(), ð.SignedBeaconBlock{Block: genesisBlk})
|
||||
require.NoError(t, err)
|
||||
st, err := stateTrie.InitializeFromProto(&p2ppb.BeaconState{})
|
||||
err = beaconDB.SaveBlock(context.Background(), genesisBlk)
|
||||
require.NoError(t, err)
|
||||
st := testutil.NewBeaconState()
|
||||
s := NewInitialSync(&Config{
|
||||
P2P: p2pt.NewTestP2P(t),
|
||||
DB: beaconDB,
|
||||
@@ -423,12 +409,9 @@ func TestService_processBlockBatch(t *testing.T) {
|
||||
currBlockRoot := genesisBlkRoot
|
||||
for i := 1; i < 10; i++ {
|
||||
parentRoot := currBlockRoot
|
||||
blk1 := ð.SignedBeaconBlock{
|
||||
Block: ð.BeaconBlock{
|
||||
Slot: uint64(i),
|
||||
ParentRoot: parentRoot[:],
|
||||
},
|
||||
}
|
||||
blk1 := testutil.NewBeaconBlock()
|
||||
blk1.Block.Slot = uint64(i)
|
||||
blk1.Block.ParentRoot = parentRoot[:]
|
||||
blk1Root, err := stateutil.BlockRoot(blk1.Block)
|
||||
require.NoError(t, err)
|
||||
err = beaconDB.SaveBlock(context.Background(), blk1)
|
||||
@@ -440,12 +423,9 @@ func TestService_processBlockBatch(t *testing.T) {
|
||||
var batch2 []*eth.SignedBeaconBlock
|
||||
for i := 10; i < 20; i++ {
|
||||
parentRoot := currBlockRoot
|
||||
blk1 := ð.SignedBeaconBlock{
|
||||
Block: ð.BeaconBlock{
|
||||
Slot: uint64(i),
|
||||
ParentRoot: parentRoot[:],
|
||||
},
|
||||
}
|
||||
blk1 := testutil.NewBeaconBlock()
|
||||
blk1.Block.Slot = uint64(i)
|
||||
blk1.Block.ParentRoot = parentRoot[:]
|
||||
blk1Root, err := stateutil.BlockRoot(blk1.Block)
|
||||
require.NoError(t, err)
|
||||
err = beaconDB.SaveBlock(context.Background(), blk1)
|
||||
@@ -533,10 +513,10 @@ func TestService_blockProviderScoring(t *testing.T) {
|
||||
genesisRoot := cache.rootCache[0]
|
||||
cache.RUnlock()
|
||||
|
||||
err := beaconDB.SaveBlock(context.Background(), ð.SignedBeaconBlock{Block: ð.BeaconBlock{Slot: 0}})
|
||||
err := beaconDB.SaveBlock(context.Background(), testutil.NewBeaconBlock())
|
||||
require.NoError(t, err)
|
||||
|
||||
st, err := stateTrie.InitializeFromProto(&p2ppb.BeaconState{})
|
||||
st := testutil.NewBeaconState()
|
||||
require.NoError(t, err)
|
||||
mc := &mock.ChainService{
|
||||
State: st,
|
||||
@@ -544,6 +524,7 @@ func TestService_blockProviderScoring(t *testing.T) {
|
||||
DB: beaconDB,
|
||||
FinalizedCheckPoint: ð.Checkpoint{
|
||||
Epoch: 0,
|
||||
Root: make([]byte, 32),
|
||||
},
|
||||
} // no-op mock
|
||||
s := &Service{
|
||||
|
||||
Reference in New Issue
Block a user