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

Block interface clean up (#8947)

Browse Source
This commit is contained in:
terence tsao
2021-05-26 11:33:46 -07:00
committed by GitHub
parent caf9bdbc6f
commit 276d03553c
122 changed files with 767 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
beacon-chain/sync/initial-sync/round_robin_test.go
View File

@@ -282,7 +282,7 @@ func TestService_roundRobinSync(t *testing.T) {
genesisRoot := cache.rootCache[0]
cache.RUnlock()
err := beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(testutil.NewBeaconBlock()))
err := beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(testutil.NewBeaconBlock()))
require.NoError(t, err)
st, err := testutil.NewBeaconState()
@@ -323,7 +323,7 @@ func TestService_processBlock(t *testing.T) {
genesisBlk := testutil.NewBeaconBlock()
genesisBlkRoot, err := genesisBlk.Block.HashTreeRoot()
require.NoError(t, err)
err = beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(genesisBlk))
err = beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(genesisBlk))
require.NoError(t, err)
st, err := testutil.NewBeaconState()
require.NoError(t, err)
@@ -354,7 +354,7 @@ func TestService_processBlock(t *testing.T) {
blk2.Block.ParentRoot = blk1Root[:]
// Process block normally.
err = s.processBlock(ctx, genesis, interfaces.NewWrappedSignedBeaconBlock(blk1), func(
err = s.processBlock(ctx, genesis, interfaces.WrappedPhase0SignedBeaconBlock(blk1), func(
ctx context.Context, block interfaces.SignedBeaconBlock, blockRoot [32]byte) error {
assert.NoError(t, s.cfg.Chain.ReceiveBlock(ctx, block, blockRoot))
return nil
@@ -362,14 +362,14 @@ func TestService_processBlock(t *testing.T) {
assert.NoError(t, err)
// Duplicate processing should trigger error.
err = s.processBlock(ctx, genesis, interfaces.NewWrappedSignedBeaconBlock(blk1), func(
err = s.processBlock(ctx, genesis, interfaces.WrappedPhase0SignedBeaconBlock(blk1), func(
ctx context.Context, block interfaces.SignedBeaconBlock, blockRoot [32]byte) error {
return nil
})
assert.ErrorContains(t, errBlockAlreadyProcessed.Error(), err)
// Continue normal processing, should proceed w/o errors.
err = s.processBlock(ctx, genesis, interfaces.NewWrappedSignedBeaconBlock(blk2), func(
err = s.processBlock(ctx, genesis, interfaces.WrappedPhase0SignedBeaconBlock(blk2), func(
ctx context.Context, block interfaces.SignedBeaconBlock, blockRoot [32]byte) error {
assert.NoError(t, s.cfg.Chain.ReceiveBlock(ctx, block, blockRoot))
return nil
@@ -384,7 +384,7 @@ func TestService_processBlockBatch(t *testing.T) {
genesisBlk := testutil.NewBeaconBlock()
genesisBlkRoot, err := genesisBlk.Block.HashTreeRoot()
require.NoError(t, err)
err = beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(genesisBlk))
err = beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(genesisBlk))
require.NoError(t, err)
st, err := testutil.NewBeaconState()
require.NoError(t, err)
@@ -414,9 +414,9 @@ func TestService_processBlockBatch(t *testing.T) {
blk1.Block.ParentRoot = parentRoot[:]
blk1Root, err := blk1.Block.HashTreeRoot()
require.NoError(t, err)
err = beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(blk1))
err = beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(blk1))
require.NoError(t, err)
batch = append(batch, interfaces.NewWrappedSignedBeaconBlock(blk1))
batch = append(batch, interfaces.WrappedPhase0SignedBeaconBlock(blk1))
currBlockRoot = blk1Root
}
@@ -428,9 +428,9 @@ func TestService_processBlockBatch(t *testing.T) {
blk1.Block.ParentRoot = parentRoot[:]
blk1Root, err := blk1.Block.HashTreeRoot()
require.NoError(t, err)
err = beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(blk1))
err = beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(blk1))
require.NoError(t, err)
batch2 = append(batch2, interfaces.NewWrappedSignedBeaconBlock(blk1))
batch2 = append(batch2, interfaces.WrappedPhase0SignedBeaconBlock(blk1))
currBlockRoot = blk1Root
}
@@ -512,7 +512,7 @@ func TestService_blockProviderScoring(t *testing.T) {
genesisRoot := cache.rootCache[0]
cache.RUnlock()
err := beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(testutil.NewBeaconBlock()))
err := beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(testutil.NewBeaconBlock()))
require.NoError(t, err)
st, err := testutil.NewBeaconState()
@@ -576,7 +576,7 @@ func TestService_syncToFinalizedEpoch(t *testing.T) {
genesisRoot := cache.rootCache[0]
cache.RUnlock()
err := beaconDB.SaveBlock(context.Background(), interfaces.NewWrappedSignedBeaconBlock(testutil.NewBeaconBlock()))
err := beaconDB.SaveBlock(context.Background(), interfaces.WrappedPhase0SignedBeaconBlock(testutil.NewBeaconBlock()))
require.NoError(t, err)
st, err := testutil.NewBeaconState()