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

Refactor ReceiveBlock to receive the block root. (#5785)

Browse Source 
* refactor ReceiveBlockNoPubsub to receive block root
* Refactor ReceiveBlock to receive block root
* A few other minor refactoring to reduce block HTR
* use arg, remove HTR
* more slight refactoring, comments
* fix test build
* Merge refs/heads/master into receive-with-root
* Merge refs/heads/master into receive-with-root
This commit is contained in:
Preston Van Loon
2020-05-08 18:22:59 -07:00
committed by GitHub
parent 5b134239e3
commit 87e0fe5928
9 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
beacon-chain/sync/pending_blocks_queue.go
View File

@@ -105,7 +105,14 @@ func (r *Service) processPendingBlocks(ctx context.Context) error {
continue
}
if err := r.chain.ReceiveBlockNoPubsub(ctx, b); err != nil {
blkRoot, err := stateutil.BlockRoot(b.Block)
if err != nil {
traceutil.AnnotateError(span, err)
span.End()
return err
}
if err := r.chain.ReceiveBlockNoPubsub(ctx, b, blkRoot); err != nil {
log.Errorf("Could not process block from slot %d: %v", b.Block.Slot, err)
traceutil.AnnotateError(span, err)
}
@@ -115,13 +122,6 @@ func (r *Service) processPendingBlocks(ctx context.Context) error {
log.WithError(err).Error("Failed to broadcast block")
}
blkRoot, err := stateutil.BlockRoot(b.Block)
if err != nil {
traceutil.AnnotateError(span, err)
span.End()
return err
}
r.pendingQueueLock.Lock()
delete(r.slotToPendingBlocks, uint64(s))
delete(r.seenPendingBlocks, blkRoot)