add ut cov

plugin/consensus/para/para.go

@@ -26,6 +26,7 @@ import (
 	cty "github.com/33cn/chain33/system/dapp/coins/types"
 	"github.com/33cn/chain33/types"
 	paraexec "github.com/33cn/plugin/plugin/dapp/paracross/executor"
+	paracross "github.com/33cn/plugin/plugin/dapp/paracross/types"
 	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
 )
 
@@ -326,12 +327,6 @@ func (client *client) getLastBlockInfo() (int64, *types.Block, error) {
 		if err != nil {
 			return -2, nil, err
 		}
-		if main.Detail.Block.Height != startHeight {
-			plog.Error("get start seq's main block height not expected as config", "config", startHeight, "main",
-				main.Detail.Block.Height)
-			//main chain node is not the initial node and the startHeight not match as config
-			panic("main chain node is not the initial node, need switch main node or delete db")
-		}
 		lastBlock.MainHash = main.Detail.Block.ParentHash
 		lastBlock.MainHeight = main.Detail.Block.Height - 1
 		return blockedSeq, lastBlock, nil
@@ -452,18 +447,18 @@ func (client *client) RequestTx(currSeq int64, preMainBlockHash []byte) ([]*type
 		//not consistent case be processed at below
 		plog.Error("RequestTx", "preMainHash", hex.EncodeToString(preMainBlockHash), "currSeq preMainHash", hex.EncodeToString(blockSeq.Detail.Block.ParentHash),
 			"currSeq mainHash", hex.EncodeToString(blockSeq.Seq.Hash), "curr seq", currSeq, "ty", blockSeq.Seq.Type, "currSeq Mainheight", blockSeq.Detail.Block.Height)
-		return nil, nil, pt.ErrParaCurHashNotMatch
+		return nil, nil, paracross.ErrParaCurHashNotMatch
 	}
 	//lastSeq < CurrSeq case:
 	//lastSeq = currSeq-1, main node not update
 	if lastSeq+1 == currSeq {
 		plog.Debug("Waiting new sequence from main chain")
-		return nil, nil, pt.ErrParaWaitingNewSeq
+		return nil, nil, paracross.ErrParaWaitingNewSeq
 	}
 
 	// 1. lastSeq < currSeq-1
 	// 2. lastSeq >= currSeq and seq not consistent or fork case
-	return nil, nil, pt.ErrParaCurHashNotMatch
+	return nil, nil, paracross.ErrParaCurHashNotMatch
 }
 
 //genesis block scenario,  new main node's blockHash as preMainHash, genesis sequence+1 as currSeq
@@ -532,7 +527,7 @@ func (client *client) switchHashMatchedBlock(currSeq int64) (int64, []byte, erro
 			"new currSeq", mainSeq+1, "new preMainBlockHash", hex.EncodeToString(block.MainHash))
 		return mainSeq + 1, block.MainHash, nil
 	}
-	return -2, nil, pt.ErrParaCurHashNotMatch
+	return -2, nil, paracross.ErrParaCurHashNotMatch
 }
 
 func (client *client) removeBlocks(endHeight int64) error {
@@ -587,7 +582,7 @@ func (client *client) CreateBlock() {
 		txs, blockOnMain, err := client.RequestTx(currSeq, lastSeqMainHash)
 		if err != nil {
 			incSeqFlag = false
-			if err == pt.ErrParaCurHashNotMatch {
+			if err == paracross.ErrParaCurHashNotMatch {
 				newSeq, newSeqMainHash, err := client.switchHashMatchedBlock(currSeq)
 				if err == nil {
 					currSeq = newSeq
@@ -799,22 +794,22 @@ func checkMinerTx(current *types.BlockDetail) error {
 	}
 	baseTx := current.Block.Txs[0]
 	//判断交易类型和执行情况
-	var action pt.ParacrossAction
+	var action paracross.ParacrossAction
 	err := types.Decode(baseTx.GetPayload(), &action)
 	if err != nil {
 		return err
 	}
 	if action.GetTy() != pt.ParacrossActionMiner {
-		return pt.ErrParaMinerTxType
+		return paracross.ErrParaMinerTxType
 	}
 	//判断交易执行是否OK
 	if action.GetMiner() == nil {
-		return pt.ErrParaEmptyMinerTx
+		return paracross.ErrParaEmptyMinerTx
 	}
 
 	//判断exec 是否成功
 	if current.Receipts[0].Ty != types.ExecOk {
-		return pt.ErrParaMinerExecErr
+		return paracross.ErrParaMinerExecErr
 	}
 	return nil
 }

plugin/consensus/para/para_test.go

@@ -8,16 +8,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	//"github.com/stretchr/testify/mock"
 	"errors"
-	"math/rand"
 	"testing"
-	"time"
-
-	"github.com/33cn/chain33/common/address"
 	"github.com/33cn/chain33/types"
 	typesmocks "github.com/33cn/chain33/types/mocks"
 	paraexec "github.com/33cn/plugin/plugin/dapp/paracross/executor"
 	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
 	"github.com/stretchr/testify/mock"
+	"encoding/hex"
+	"github.com/33cn/chain33/common/crypto"
+	"github.com/33cn/chain33/common/address"
+	"math/rand"
+	"time"
 )
 
 var (
@@ -29,67 +30,9 @@ var (
 func TestFilterTxsForPara(t *testing.T) {
 	types.Init(Title, nil)
 
-	//all para tx group
-	tx5, err := createCrossParaTx("toB", 5)
-	assert.Nil(t, err)
-	tx6, err := createCrossParaTx("toB", 6)
-	assert.Nil(t, err)
-	tx56 := []*types.Transaction{tx5, tx6}
-	txGroup56, err := createTxsGroup(tx56)
-	assert.Nil(t, err)
-
-	//para cross tx group fail
-	tx7, _ := createCrossParaTx("toA", 1)
-	tx8, err := createCrossParaTx("toB", 8)
-	assert.Nil(t, err)
-	tx78 := []*types.Transaction{tx7, tx8}
-	txGroup78, err := createTxsGroup(tx78)
-	assert.Nil(t, err)
-
-	//all para tx group
-	txB, err := createCrossParaTx("toB", 11)
-	assert.Nil(t, err)
-	txC, err := createCrossParaTx("toB", 12)
-	assert.Nil(t, err)
-	txBC := []*types.Transaction{txB, txC}
-	txGroupBC, err := createTxsGroup(txBC)
-	assert.Nil(t, err)
-
-	//single para tx
-	txD, err := createCrossParaTempTx("toB", 10)
-	assert.Nil(t, err)
-
-	txs := []*types.Transaction{}
-	txs = append(txs, txGroup56...)
-	txs = append(txs, txGroup78...)
-	txs = append(txs, txGroupBC...)
-	txs = append(txs, txD)
-
-	//for i, tx := range txs {
-	//	t.Log("tx exec name", "i", i, "name", string(tx.Execer))
-	//}
-
-	recpt5 := &types.ReceiptData{Ty: types.ExecPack}
-	recpt6 := &types.ReceiptData{Ty: types.ExecPack}
-
-	log7 := &types.ReceiptLog{Ty: types.TyLogErr}
-	logs := []*types.ReceiptLog{log7}
-	recpt7 := &types.ReceiptData{Ty: types.ExecPack, Logs: logs}
-	recpt8 := &types.ReceiptData{Ty: types.ExecPack}
-
-	recptB := &types.ReceiptData{Ty: types.ExecPack}
-	recptC := &types.ReceiptData{Ty: types.ExecPack}
-	recptD := &types.ReceiptData{Ty: types.ExecPack}
-	receipts := []*types.ReceiptData{recpt5, recpt6, recpt7, recpt8, recptB, recptC, recptD}
-
-	block := &types.Block{Txs: txs}
-	detail := &types.BlockDetail{
-		Block:    block,
-		Receipts: receipts,
-	}
-
+	detail,filterTxs,_ := createTestTxs(t)
 	rst := paraexec.FilterTxsForPara(Title, detail)
-	filterTxs := []*types.Transaction{tx5, tx6, txB, txC}
+
 	assert.Equal(t, filterTxs, rst)
 
 }
@@ -180,3 +123,101 @@ func TestGetBlockHashForkHeightOnMainChain(t *testing.T) {
 	assert.Equal(t, int64(1), ret)
 
 }
+
+func createTestTxs(t *testing.T) (*types.BlockDetail,[]*types.Transaction,[]*types.Transaction){
+	//all para tx group
+	tx5, err := createCrossParaTx("toB", 5)
+	assert.Nil(t, err)
+	tx6, err := createCrossParaTx("toB", 6)
+	assert.Nil(t, err)
+	tx56 := []*types.Transaction{tx5, tx6}
+	txGroup56, err := createTxsGroup(tx56)
+	assert.Nil(t, err)
+
+	//para cross tx group fail
+	tx7, _ := createCrossParaTx("toA", 1)
+	tx8, err := createCrossParaTx("toB", 8)
+	assert.Nil(t, err)
+	tx78 := []*types.Transaction{tx7, tx8}
+	txGroup78, err := createTxsGroup(tx78)
+	assert.Nil(t, err)
+
+	//all para tx group
+	txB, err := createCrossParaTx("toB", 11)
+	assert.Nil(t, err)
+	txC, err := createCrossParaTx("toB", 12)
+	assert.Nil(t, err)
+	txBC := []*types.Transaction{txB, txC}
+	txGroupBC, err := createTxsGroup(txBC)
+	assert.Nil(t, err)
+
+	//single para tx
+	txD, err := createCrossParaTempTx("toB", 10)
+	assert.Nil(t, err)
+
+	txs := []*types.Transaction{}
+	txs = append(txs, txGroup56...)
+	txs = append(txs, txGroup78...)
+	txs = append(txs, txGroupBC...)
+	txs = append(txs, txD)
+
+	//for i, tx := range txs {
+	//	t.Log("tx exec name", "i", i, "name", string(tx.Execer))
+	//}
+
+	recpt5 := &types.ReceiptData{Ty: types.ExecOk}
+	recpt6 := &types.ReceiptData{Ty: types.ExecOk}
+
+	log7 := &types.ReceiptLog{Ty: types.TyLogErr}
+	logs := []*types.ReceiptLog{log7}
+	recpt7 := &types.ReceiptData{Ty: types.ExecPack, Logs: logs}
+	recpt8 := &types.ReceiptData{Ty: types.ExecPack}
+
+	recptB := &types.ReceiptData{Ty: types.ExecPack}
+	recptC := &types.ReceiptData{Ty: types.ExecPack}
+	recptD := &types.ReceiptData{Ty: types.ExecPack}
+	receipts := []*types.ReceiptData{recpt5, recpt6, recpt7, recpt8, recptB, recptC, recptD}
+
+	block := &types.Block{Height:10, Txs: txs}
+	detail := &types.BlockDetail{
+		Block:    block,
+		Receipts: receipts,
+	}
+
+	filterTxs := []*types.Transaction{tx5, tx6, txB, txC}
+	return detail,filterTxs,txs
+
+}
+
+func TestAddMinerTx(t *testing.T){
+	pk, err := hex.DecodeString(minerPrivateKey)
+	assert.Nil(t,err)
+
+	secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
+	assert.Nil(t,err)
+
+	priKey, err := secp.PrivKeyFromBytes(pk)
+	assert.Nil(t,err)
+
+	mainForkParacrossCommitTx = 1
+	block := &types.Block{}
+
+	mainDetail, filterTxs, allTxs := createTestTxs(t)
+	mainBlock := &types.BlockSeq{
+		Seq:&types.BlockSequence{},
+		Detail:mainDetail}
+	para := new(client)
+	para.privateKey = priKey
+	para.addMinerTx(nil, block,mainBlock,allTxs)
+
+	ret := checkTxInMainBlock(filterTxs[0],mainDetail)
+	assert.True(t,ret)
+
+	tx2,_ := createCrossMainTx("toA")
+	ret = checkTxInMainBlock(tx2,mainDetail)
+	assert.False(t,ret)
+
+
+
+
+}
\ No newline at end of file

plugin/consensus/para/paratxrequest_test.go

@@ -25,6 +25,7 @@ import (
 	typesmocks "github.com/33cn/chain33/types/mocks"
 	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
 	"github.com/stretchr/testify/assert"
+	"time"
 )
 
 func init() {
@@ -273,3 +274,31 @@ func TestGetConsensusStatus(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, int64(1), ret.Height)
 }
+
+func TestSendCommitMsg(t *testing.T){
+	para := new(client)
+	grpcClient := &typesmocks.Chain33Client{}
+	//grpcClient.On("GetFork", mock.Anything, &types.ReqKey{Key: []byte("ForkBlockHash")}).Return(&types.Int64{Data: 1}, errors.New("err")).Once()
+	para.grpcClient = grpcClient
+	commitCli := new(commitMsgClient)
+	commitCli.paraClient = para
+	commitCli.quit = make(chan struct{})
+
+	commitCli.paraClient.wg.Add(1)
+	sendMsgCh := make(chan *types.Transaction, 1)
+	go commitCli.sendCommitMsg(sendMsgCh)
+
+	//reply := &types.Reply{
+	//	IsOk: true,
+	//	Msg:  types.Encode(status),
+	//}
+	grpcClient.On("SendTransaction", mock.Anything, mock.Anything).Return(nil,types.ErrNotFound).Twice()
+	tx := &types.Transaction{}
+
+	sendMsgCh <-tx
+	time.Sleep(3*time.Second)
+
+	//para.BaseClient.Close()
+	close(commitCli.quit)
+
+}
\ No newline at end of file

plugin/dapp/paracross/testnode/cfg.go

@@ -110,6 +110,7 @@ searchHashMatchedBlockDepth=10000
 #创世地址额度
 genesisAmount=100000000
 MainBlockHashForkHeight=1
+MainForkParacrossCommitTx=1
 
 [store]
 name="mavl"