diff options
author | Sonic <sonic@dexon.org> | 2018-11-14 15:41:09 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:53 +0800 |
commit | 872a05bada57df6ef8b17f7791e584b860dd5bdc (patch) | |
tree | af29ea76c46cfbcbdfe6f643b054cfee346fa2ae /core/blockchain.go | |
parent | b7c5ae8a792604fe74455644a74fccf793e248f7 (diff) | |
download | dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.tar dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.tar.gz dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.tar.bz2 dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.tar.lz dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.tar.xz dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.tar.zst dexon-872a05bada57df6ef8b17f7791e584b860dd5bdc.zip |
core: use storeRoundHeight to avoid type mismatch (#21)
No need to store round 0, it's already pushed in genesis block
Diffstat (limited to 'core/blockchain.go')
-rw-r--r-- | core/blockchain.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 2bccaf9dc..67bfacb0a 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -232,9 +232,6 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par } } - // Set genesis round height mapping. - bc.roundHeightMap.Store(0, 0) - // Take ownership of this particular state go bc.update() return bc, nil @@ -308,9 +305,6 @@ func NewBlockChainWithDexonValidator(db ethdb.Database, cacheConfig *CacheConfig } } - // Set genesis round height mapping. - bc.roundHeightMap.Store(0, 0) - // Take ownership of this particular state go bc.update() return bc, nil @@ -1751,9 +1745,8 @@ func (bc *BlockChain) processPendingBlock(block *types.Block, witness *coreTypes cache, _ := bc.stateCache.TrieDB().Size() stats.report([]*types.Block{pendingIns.block}, 0, cache) - _, ok := bc.roundHeightMap.Load(pendingIns.block.Round()) - if !ok { - bc.roundHeightMap.Store(pendingIns.block.Round(), pendingHeight) + if _, ok := bc.GetRoundHeight(pendingIns.block.Round()); !ok { + bc.storeRoundHeight(pendingIns.block.Round(), pendingHeight) } } // Append a single chain head event if we've progressed the chain @@ -2177,3 +2170,7 @@ func (bc *BlockChain) GetRoundHeight(round uint64) (uint64, bool) { } return h.(uint64), true } + +func (bc *BlockChain) storeRoundHeight(round uint64, height uint64) { + bc.roundHeightMap.Store(round, height) +} |