diff options
| author | Wei-Ning Huang <w@cobinhood.com> | 2018-10-16 10:37:01 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | 9af791103c2633bd095805e5d82d55ebc5305b68 (patch) | |
| tree | fa9b5f952284454a4467a835518edd6d2073a7c7 | |
| parent | 2c67107155875b528b15628658e31cb97b41f8db (diff) | |
| download | dexon-9af791103c2633bd095805e5d82d55ebc5305b68.tar dexon-9af791103c2633bd095805e5d82d55ebc5305b68.tar.gz dexon-9af791103c2633bd095805e5d82d55ebc5305b68.tar.bz2 dexon-9af791103c2633bd095805e5d82d55ebc5305b68.tar.lz dexon-9af791103c2633bd095805e5d82d55ebc5305b68.tar.xz dexon-9af791103c2633bd095805e5d82d55ebc5305b68.tar.zst dexon-9af791103c2633bd095805e5d82d55ebc5305b68.zip | |
core: fix nil map initialization
| -rw-r--r-- | core/blockchain.go | 7 | ||||
| -rw-r--r-- | dex/app.go | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 234a67d6c..208edd5bb 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -230,6 +230,9 @@ func (bc *BlockChain) AddConfirmedBlock(block *coreTypes.Block) { defer bc.confirmedBlockMu.Unlock() bc.confirmedBlock[block.Hash] = block + if bc.filteredConfirmedBlock[block.Position.ChainID] == nil { + bc.filteredConfirmedBlock[block.Position.ChainID] = make(map[coreCommon.Hash]*coreTypes.Block) + } bc.filteredConfirmedBlock[block.Position.ChainID][block.Hash] = block } @@ -240,6 +243,10 @@ func (bc *BlockChain) RemoveConfirmedBlock(hash coreCommon.Hash) { block := bc.confirmedBlock[hash] delete(bc.filteredConfirmedBlock[block.Position.ChainID], block.Hash) delete(bc.confirmedBlock, block.Hash) + + if len(bc.filteredConfirmedBlock[block.Position.ChainID]) == 0 { + bc.filteredConfirmedBlock[block.Position.ChainID] = nil + } } func (bc *BlockChain) GetConfirmedBlockByHash(hash coreCommon.Hash) *coreTypes.Block { diff --git a/dex/app.go b/dex/app.go index 06b5a5381..1e97c4859 100644 --- a/dex/app.go +++ b/dex/app.go @@ -20,11 +20,12 @@ package dex import ( "bytes" "fmt" - "github.com/dexon-foundation/dexon/log" "math/big" "sync" "time" + "github.com/dexon-foundation/dexon/log" + coreCommon "github.com/dexon-foundation/dexon-consensus-core/common" coreTypes "github.com/dexon-foundation/dexon-consensus-core/core/types" |