modify blockchain test and del fork map

Author: lyh169

blockchain/blockstore.go

@@ -152,10 +152,10 @@ func NewBlockStore(chain *BlockChain, db dbm.DB, client queue.Client) *BlockStor
 		blockStore.saveSequence = chain.isRecordBlockSequence
 		blockStore.isParaChain = chain.isParaChain
 	}
-	tycfg := chain.client.GetConfig()
+	cfg := chain.client.GetConfig()
 	if height == -1 {
 		chainlog.Info("load block height error, may be init database", "height", height)
-		if tycfg.IsEnable("quickIndex") {
+		if cfg.IsEnable("quickIndex") {
 			blockStore.saveQuickIndexFlag()
 		}
 	} else {
@@ -169,7 +169,7 @@ func NewBlockStore(chain *BlockChain, db dbm.DB, client queue.Client) *BlockStor
 		if err != nil {
 			panic(err)
 		}
-		if tycfg.IsEnable("quickIndex") {
+		if cfg.IsEnable("quickIndex") {
 			if flag == 0 {
 				blockStore.initQuickIndex(height)
 			}

blockchain/blockstore_test.go

@@ -12,8 +12,19 @@ import (
 	"github.com/33cn/chain33/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/33cn/chain33/queue"
+	"github.com/33cn/chain33/util"
 )
 
+func InitEnv() *BlockChain {
+	cfg := types.NewChain33Config(util.GetDefaultCfgstring())
+	q := queue.New("channel")
+	q.SetConfig(cfg)
+	chain := New(cfg)
+	chain.client = q.Client()
+	return chain
+}
+
 func TestGetStoreUpgradeMeta(t *testing.T) {
 	dir, err := ioutil.TempDir("", "example")
 	assert.Nil(t, err)
@@ -22,7 +33,8 @@ func TestGetStoreUpgradeMeta(t *testing.T) {
 
 	blockStoreDB := dbm.NewDB("blockchain", "leveldb", dir, 100)
 
-	blockStore := NewBlockStore(nil, blockStoreDB, nil)
+	chain := InitEnv()
+	blockStore := NewBlockStore(chain, blockStoreDB, nil)
 	require.NotNil(t, blockStore)
 
 	meta, err := blockStore.GetStoreUpgradeMeta()
@@ -45,7 +57,8 @@ func TestSeqSaveAndGet(t *testing.T) {
 
 	blockStoreDB := dbm.NewDB("blockchain", "leveldb", dir, 100)
 
-	blockStore := NewBlockStore(nil, blockStoreDB, nil)
+	chain := InitEnv()
+	blockStore := NewBlockStore(chain, blockStoreDB, nil)
 	assert.NotNil(t, blockStore)
 	blockStore.saveSequence = true
 	blockStore.isParaChain = false
@@ -85,7 +98,8 @@ func TestParaSeqSaveAndGet(t *testing.T) {
 
 	blockStoreDB := dbm.NewDB("blockchain", "leveldb", dir, 100)
 
-	blockStore := NewBlockStore(nil, blockStoreDB, nil)
+	bchain := InitEnv()
+	blockStore := NewBlockStore(bchain, blockStoreDB, nil)
 	assert.NotNil(t, blockStore)
 	blockStore.saveSequence = true
 	blockStore.isParaChain = true
@@ -147,7 +161,8 @@ func TestSeqCreateAndDelete(t *testing.T) {
 
 	blockStoreDB := dbm.NewDB("blockchain", "leveldb", dir, 100)
 
-	blockStore := NewBlockStore(nil, blockStoreDB, nil)
+	chain := InitEnv()
+	blockStore := NewBlockStore(chain, blockStoreDB, nil)
 	assert.NotNil(t, blockStore)
 	blockStore.saveSequence = false
 	blockStore.isParaChain = true

blockchain/chain.go

@@ -120,7 +120,7 @@ type BlockChain struct {
 
 //New new
 func New(cfg *types.Chain33Config) *BlockChain {
-	mcfg := cfg.GetMConfig().BlockChain
+	mcfg := cfg.GetModuleConfig().BlockChain
 	futureBlocks, err := lru.New(maxFutureBlocks)
 	if err != nil {
 		panic("when New BlockChain lru.New return err")
@@ -164,7 +164,7 @@ func New(cfg *types.Chain33Config) *BlockChain {
 }
 
 func (chain *BlockChain) initConfig(cfg *types.Chain33Config) {
-	mcfg := cfg.GetMConfig().BlockChain
+	mcfg := cfg.GetModuleConfig().BlockChain
 	if cfg.IsEnable("TxHeight") && chain.DefCacheSize <= (types.LowAllowPackHeight+types.HighAllowPackHeight+1) {
 		panic("when Enable TxHeight DefCacheSize must big than types.LowAllowPackHeight")
 	}