diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-10 17:59:17 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-10 17:59:17 +0800 |
commit | 4345050093710739c9e417956bc3a8339e7d99a6 (patch) | |
tree | 24fe4e21b95605f8854f6be073a762ece294d479 /core/blockchain.go | |
parent | ac3187e706bc11f1b36e32015a6e51a96cc8cfe9 (diff) | |
download | dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.tar dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.tar.gz dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.tar.bz2 dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.tar.lz dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.tar.xz dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.tar.zst dexon-consensus-4345050093710739c9e417956bc3a8339e7d99a6.zip |
core: reduce blockrandomness message (#477)
* core: reduce blockchain randomness msg
* add test
Diffstat (limited to 'core/blockchain.go')
-rw-r--r-- | core/blockchain.go | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index aacb65d..b6c8b1d 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -311,21 +311,23 @@ func (bc *blockChain) addBlock(b *types.Block) error { return nil } +func (bc *blockChain) shouldAddRandomness(r *types.BlockRandomnessResult) bool { + bc.lock.RLock() + defer bc.lock.RUnlock() + if bc.lastDelivered != nil && + bc.lastDelivered.Position.Newer(r.Position) { + return false + } + _, exists := bc.pendingRandomnesses[r.Position] + if exists { + return false + } + b := bc.findPendingBlock(r.Position) + return b == nil || len(b.Finalization.Randomness) == 0 +} + func (bc *blockChain) addRandomness(r *types.BlockRandomnessResult) error { - if func() bool { - bc.lock.RLock() - defer bc.lock.RUnlock() - if bc.lastDelivered != nil && - bc.lastDelivered.Position.Newer(r.Position) { - return true - } - _, exists := bc.pendingRandomnesses[r.Position] - if exists { - return true - } - b := bc.findPendingBlock(r.Position) - return b != nil && len(b.Finalization.Randomness) > 0 - }() { + if !bc.shouldAddRandomness(r) { return nil } ok, err := bc.verifyRandomness(r.BlockHash, r.Position.Round, r.Randomness) |