rmv  user.p.xx.commit tx in commit tx
@@ -488,10 +488,14 @@ func (s *VoteTestSuite) TestVoteTx() {
tx7, err := createAssetTransferTx(s.Suite, PrivKeyC, nil)
s.Nil(err)
+ tx8, err := createCrossCommitTx(s.Suite)
+ s.Nil(err)
+
txs := []*types.Transaction{tx, tx1, tx2}
txs = append(txs, txGroup34...)
txs = append(txs, txGroup56...)
txs = append(txs, tx7)
+ txs = append(txs, tx8)
s.exec.SetTxs(txs)
//for i,tx := range txs{
@@ -508,7 +512,8 @@ func (s *VoteTestSuite) TestVoteTx() {
recpt5 := &types.ReceiptData{Ty: types.ExecPack}
recpt6 := &types.ReceiptData{Ty: types.ExecPack}
recpt7 := &types.ReceiptData{Ty: types.ExecOk}
- receipts := []*types.ReceiptData{recpt0, recpt1, recpt2, recpt3, recpt4, recpt5, recpt6, recpt7}
+ recpt8 := &types.ReceiptData{Ty: types.ExecOk}
+ receipts := []*types.ReceiptData{recpt0, recpt1, recpt2, recpt3, recpt4, recpt5, recpt6, recpt7,recpt8}
s.exec.SetReceipt(receipts)
set, err := s.exec.ExecLocal(tx, recpt0, 0)
s.Nil(err)
@@ -697,6 +702,26 @@ func createCrossParaTx(s suite.Suite, to []byte) (*types.Transaction, error) {
return tx, nil
}
+func createCrossCommitTx(s suite.Suite) (*types.Transaction, error) {
+ status := &pt.ParacrossNodeStatus{MainBlockHash:[]byte("hash"),MainBlockHeight:0,Title:Title}
+
+ tx, err := pt.CreateRawCommitTx4MainChain(status,Title + pt.ParaX,0)
+ assert.Nil(s.T(), err, "create asset transfer failed")
+ if err != nil {
+ return nil, err
+ }
+
+ //tx, err = signTx(s, tx, privFrom)
+ //assert.Nil(s.T(), err, "sign asset transfer failed")
+ //if err != nil {
+ // return nil, err
+ //}
+
+ return tx, nil
+}
+
+
+
func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transaction, error) {
group, err := types.CreateTxGroup(txs)
if err != nil {
