fix ut

plugin/consensus/para/para.go

@@ -250,7 +250,7 @@ func (client *client) SetQueueClient(c queue.Client) {
 	})
 	go client.EventLoop()
 	client.wg.Add(1)
-	go client.commitMsgClient.process()
+	go client.commitMsgClient.handler()
 	client.wg.Add(1)
 	go client.CreateBlock()
 	client.wg.Add(1)
@@ -268,6 +268,11 @@ func (client *client) InitBlock() {
 	}
 	client.grpcClient = grpcCli
 
+	err = client.commitMsgClient.setSelfConsEnable()
+	if err != nil {
+		panic(err)
+	}
+
 	block, err := client.RequestLastBlock()
 	if err != nil {
 		panic(err)

plugin/consensus/para/paracommitmsg.go

@@ -930,15 +930,3 @@ func (client *commitMsgClient) isSelfConsEnable(height int64) bool {
 	}
 	return false
 }
-
-func (client *commitMsgClient) initConfig() {
-	err := client.setSelfConsEnable()
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (client *commitMsgClient) process() {
-	client.initConfig()
-	client.handler()
-}

plugin/dapp/paracross/executor/paracross_test.go

@@ -469,32 +469,32 @@ type VoteTestSuite struct {
 	exec *Paracross
 }
 
-func (suite *VoteTestSuite) SetupSuite() {
+func (s *VoteTestSuite) SetupSuite() {
 	//para_init(Title)
-	suite.exec = newParacross().(*Paracross)
+	s.exec = newParacross().(*Paracross)
 	api := new(apimock.QueueProtocolAPI)
 	api.On("GetConfig", mock.Anything).Return(chain33TestCfg, nil)
-	suite.exec.SetAPI(api)
+	s.exec.SetAPI(api)
 
-	suite.stateDB, _ = dbm.NewGoMemDB("state", "state", 1024)
+	s.stateDB, _ = dbm.NewGoMemDB("state", "state", 1024)
 	// memdb 不支持KVDB接口， 等测试完Exec ， 再扩展 memdb
-	//suite.localDB, _ = dbm.NewGoMemDB("local", "local", 1024)
-	suite.localDB = new(dbmock.KVDB)
+	//s.localDB, _ = dbm.NewGoMemDB("local", "local", 1024)
+	s.localDB = new(dbmock.KVDB)
 
-	suite.exec.SetLocalDB(suite.localDB)
-	suite.exec.SetStateDB(suite.stateDB)
-	suite.exec.SetEnv(0, 0, 0)
+	s.exec.SetLocalDB(s.localDB)
+	s.exec.SetStateDB(s.stateDB)
+	s.exec.SetEnv(0, 0, 0)
 
 	stageKey := calcParaSelfConsStagesKey()
 	stage := &pt.SelfConsensStage{BlockHeight: 0, Enable: pt.ParaConfigYes}
 	stages := &pt.SelfConsensStages{Items: []*pt.SelfConsensStage{stage}}
-	suite.stateDB.Set(stageKey, types.Encode(stages))
-	value, err := suite.stateDB.Get(stageKey)
+	s.stateDB.Set(stageKey, types.Encode(stages))
+	value, err := s.stateDB.Get(stageKey)
 	if err != nil {
-		suite.T().Error("get setup stages failed", err)
+		s.T().Error("get setup stages failed", err)
 		return
 	}
-	assert.Equal(suite.T(), value, types.Encode(stages))
+	assert.Equal(s.T(), value, types.Encode(stages))
 
 }