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

Native Blocks Ep. 2 - Switch usages to new package (#10885)

Browse Source 
* panic in SizeSSZ

* moving slowly

* adapt old code to new interfaces

* return interfaces from factory functions

* replace the rest of WrappedSignedBeaconBlock

* WrappedBeaconBlock

* WrappedBeaconBlockBody

* miscellaneous

* Test_BeaconBlockIsNil

* replace usages of BeaconBlockIsNil

* replace usages of mutator

* fix all build errors

* fix some more issues

* mutator changes

* relax assertions when initializing

* revert changes in object_mapping.go

* allow calling Proto on nil

* Revert "allow calling Proto on nil"

This reverts commit ecc84e4553.

* modify Copy and Proto methods

* remove unused var

* fix block batch tests

* correct BUILD file

* Error when initializing nil objects

* one more error fix

* add missing comma

* rename alias to blocktest

* add logging

* error when SignedBeaconBlock is nil

* fix last test

* import fix

* broken

* working

* test fixes

* reduce complexity of processPendingBlocks

* simplified
This commit is contained in:
Radosław Kapka
2022-08-02 17:30:46 +02:00
committed by GitHub
parent 4b46dead2f
commit 879e310332
217 changed files with 2282 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@ import (
"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
"github.com/prysmaticlabs/prysm/config/features"
"github.com/prysmaticlabs/prysm/config/params"
"github.com/prysmaticlabs/prysm/consensus-types/blocks"
types "github.com/prysmaticlabs/prysm/consensus-types/primitives"
"github.com/prysmaticlabs/prysm/consensus-types/wrapper"
"github.com/prysmaticlabs/prysm/container/slice"
"github.com/prysmaticlabs/prysm/crypto/hash"
"github.com/prysmaticlabs/prysm/encoding/bytesutil"
@@ -218,7 +218,7 @@ func connectPeer(t *testing.T, host *p2pt.TestP2P, datum *peerData, peerStatus *
mChain := &mock.ChainService{Genesis: time.Now(), ValidatorsRoot: [32]byte{}}
for i := 0; i < len(ret); i++ {
wsb, err := wrapper.WrappedSignedBeaconBlock(ret[i])
wsb, err := blocks.NewSignedBeaconBlock(ret[i])
require.NoError(t, err)
assert.NoError(t, beaconsync.WriteBlockChunk(stream, mChain, p.Encoding(), wsb))
}
@@ -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, blocks []*ethpb.SignedBeaconBlock, finalizedSlot types.Slot,
t *testing.T, host *p2pt.TestP2P, blks []*ethpb.SignedBeaconBlock, finalizedSlot types.Slot,
peerStatus *peers.Status,
) peer.ID {
p := p2pt.NewTestP2P(t)
@@ -286,11 +286,11 @@ func connectPeerHavingBlocks(
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) {
if uint64(i) >= uint64(len(blocks)) {
if uint64(i) >= uint64(len(blks)) {
break
}
chain := &mock.ChainService{Genesis: time.Now(), ValidatorsRoot: [32]byte{}}
wsb, err := wrapper.WrappedSignedBeaconBlock(blocks[i])
wsb, err := blocks.NewSignedBeaconBlock(blks[i])
require.NoError(t, err)
require.NoError(t, beaconsync.WriteBlockChunk(stream, chain, p.Encoding(), wsb))
}
@@ -308,7 +308,7 @@ func connectPeerHavingBlocks(
return
}
for _, expectedRoot := range *req {
for _, blk := range blocks {
for _, blk := range blks {
if root, err := blk.Block.HashTreeRoot(); err == nil && expectedRoot == root {
log.Printf("Found blocks_by_root: %#x for slot: %v", root, blk.Block.Slot)
_, err := stream.Write([]byte{0x00})
@@ -323,7 +323,7 @@ func connectPeerHavingBlocks(
p.Connect(host)
finalizedEpoch := slots.ToEpoch(finalizedSlot)
headRoot, err := blocks[len(blocks)-1].Block.HashTreeRoot()
headRoot, err := blks[len(blks)-1].Block.HashTreeRoot()
require.NoError(t, err)
peerStatus.Add(new(enr.Record), p.PeerID(), nil, network.DirOutbound)
@@ -333,7 +333,7 @@ func connectPeerHavingBlocks(
FinalizedRoot: []byte(fmt.Sprintf("finalized_root %d", finalizedEpoch)),
FinalizedEpoch: finalizedEpoch,
HeadRoot: headRoot[:],
HeadSlot: blocks[len(blocks)-1].Block.Slot,
HeadSlot: blks[len(blks)-1].Block.Slot,
})
return p.PeerID()