add supervisionaccount_test.go

plugin/dapp/paracross/executor/superaccount_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	//"github.com/stretchr/testify/mock"
+	"strings"
 	"testing"
 
 	apimock "github.com/33cn/chain33/client/mocks"
@@ -16,8 +17,6 @@ import (
 	dbmock "github.com/33cn/chain33/common/db/mocks"
 	"github.com/33cn/chain33/types"
 
-	"strings"
-
 	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
 	"github.com/stretchr/testify/mock"
 )
@@ -25,9 +24,7 @@ import (
 var (
 	PrivKey14K = "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" // 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt
 	Account14K = "14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-	//Account1MC = "1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs"
 	applyAddrs = "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4, 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR, 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs"
-
 	Account12Q = "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 	PrivKey12Q = "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01"
 )
@@ -234,7 +231,6 @@ func (suite *NodeManageTestSuite) testNodeGroupConfigQuit() {
 	receipt := nodeCommit(suite, PrivKeyB, tx)
 	checkGroupApplyReceipt(suite, receipt)
 
-	suite.Equal(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
 	var g pt.ReceiptParaNodeGroupConfig
 	err = types.Decode(receipt.Logs[0].Log, &g)
 	suite.Nil(err)
@@ -265,7 +261,6 @@ func (suite *NodeManageTestSuite) testNodeGroupConfig() {
 	receipt := nodeCommit(suite, PrivKeyB, tx)
 	checkGroupApplyReceipt(suite, receipt)
 
-	suite.Equal(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
 	var g pt.ReceiptParaNodeGroupConfig
 	err = types.Decode(receipt.Logs[0].Log, &g)
 	suite.Nil(err)

plugin/dapp/paracross/executor/supervisionaccount_test.go

+package executor
+
+import (
+	"fmt"
+	"github.com/33cn/chain33/types"
+	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
+)
+
+// createRawSupervisionNodeConfigTx create raw tx for node config
+func createRawSupervisionNodeConfigTx(config *pt.ParaNodeAddrConfig) (*types.Transaction, error) {
+	action := &pt.ParacrossAction{
+		Ty:    pt.ParacrossActionSupervisionNodeGroupConfig,
+		Value: &pt.ParacrossAction_SupervisionNodeGroupConfig{SupervisionNodeGroupConfig: config},
+	}
+	tx := &types.Transaction{
+		Payload: types.Encode(action),
+		Execer:  []byte(config.Title + pt.ParaX),
+	}
+	return tx, nil
+}
+
+func (suite *NodeManageTestSuite) TestSupervisionExec() {
+	//suite.testSupervisionNodeConfigQuit()
+	suite.testSupervisionNodeConfigApprove()
+}
+
+func (suite *NodeManageTestSuite) testSupervisionNodeConfigQuit() {
+	config := &pt.ParaNodeAddrConfig{
+		Title: chain33TestCfg.GetTitle(),
+		Op:    pt.ParacrossSupervisionNodeApply,
+		Addr:  Account14K,
+	}
+	tx, err := createRawSupervisionNodeConfigTx(config)
+	suite.Nil(err)
+
+	receipt := nodeCommit(suite, PrivKey14K, tx)
+	fmt.Println(receipt)
+	fmt.Println(receipt.Ty, int32(types.ExecOk))
+	fmt.Println(receipt.KV, 1)
+	fmt.Println(receipt.Logs, 1)
+	fmt.Println(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+
+	//assert.Equal(suite.T(), int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+	//checkGroupApplyReceipt(suite, receipt)
+
+	//suite.Equal(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+	var g pt.ReceiptParaNodeGroupConfig
+	err = types.Decode(receipt.Logs[0].Log, &g)
+	suite.Nil(err)
+
+	config = &pt.ParaNodeAddrConfig{
+		Title: chain33TestCfg.GetTitle(),
+		Op:    pt.ParacrossSupervisionNodeQuit,
+		Id:    g.Current.Id,
+	}
+	tx, err = createRawSupervisionNodeConfigTx(config)
+	suite.Nil(err)
+
+	nodeCommit(suite, PrivKey14K, tx)
+}
+
+func (suite *NodeManageTestSuite) testSupervisionNodeConfigApprove() {
+	config := &pt.ParaNodeAddrConfig{
+		Title: chain33TestCfg.GetTitle(),
+		Op:    pt.ParacrossSupervisionNodeApply,
+		Addr:  Account14K,
+	}
+	tx, err := createRawSupervisionNodeConfigTx(config)
+	suite.Nil(err)
+
+	receipt := nodeCommit(suite, PrivKey14K, tx)
+	fmt.Println(receipt)
+	fmt.Println(receipt.Ty, int32(types.ExecOk))
+	fmt.Println(receipt.KV, 1)
+	fmt.Println(receipt.Logs, 1)
+	fmt.Println(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+
+	//assert.Equal(suite.T(), int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+	//checkGroupApplyReceipt(suite, receipt)
+
+	//suite.Equal(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+	var g pt.ReceiptParaNodeGroupConfig
+	err = types.Decode(receipt.Logs[0].Log, &g)
+	suite.Nil(err)
+
+	config = &pt.ParaNodeAddrConfig{
+		Title: chain33TestCfg.GetTitle(),
+		Id:    g.Current.Id,
+		Op:    pt.ParacrossSupervisionNodeApprove,
+	}
+	tx, err = createRawSupervisionNodeConfigTx(config)
+	suite.Nil(err)
+
+	receipt = nodeCommit(suite, Account14K, tx)
+
+	fmt.Println(receipt)
+	fmt.Println(receipt.Ty, int32(types.ExecOk))
+	fmt.Println(receipt.KV, 1)
+	fmt.Println(receipt.Logs, 1)
+
+	fmt.Println(int32(pt.TyLogParaNodeGroupConfig), receipt.Logs[0].Ty)
+	checkGroupApproveReceipt(suite, receipt)
+}

plugin/dapp/paracross/proto/paracross.proto

@@ -342,6 +342,7 @@ message ParacrossAction {
         ParaStageConfig       selfStageConfig = 11;
         CrossAssetTransfer    crossAssetTransfer = 12;
         ParaBindMinerCmd      paraBindMiner   = 13;
+        ParaNodeAddrConfig  supervisionNodeGroupConfig=14;
     }
     int32 ty = 2;
 }

plugin/dapp/paracross/types/paracross.go

@@ -91,6 +91,8 @@ const (
 	ParacrossActionSelfStageConfig
 	// ParacrossActionCrossAssetTransfer crossChain asset transfer key
 	ParacrossActionCrossAssetTransfer
+	// ParacrossActionSupervisionNodeGroupConfig
+	ParacrossActionSupervisionNodeGroupConfig
 )
 
 //paracross asset porcess

plugin/dapp/paracross/types/type.go

@@ -117,18 +117,19 @@ func (p *ParacrossType) GetLogMap() map[int64]*types.LogInfo {
 // GetTypeMap get action type
 func (p *ParacrossType) GetTypeMap() map[string]int32 {
 	return map[string]int32{
-		"Commit":             ParacrossActionCommit,
-		"Miner":              ParacrossActionMiner,
-		"AssetTransfer":      ParacrossActionAssetTransfer,
-		"AssetWithdraw":      ParacrossActionAssetWithdraw,
-		"Transfer":           ParacrossActionTransfer,
-		"Withdraw":           ParacrossActionWithdraw,
-		"TransferToExec":     ParacrossActionTransferToExec,
-		"CrossAssetTransfer": ParacrossActionCrossAssetTransfer,
-		"NodeConfig":         ParacrossActionNodeConfig,
-		"NodeGroupConfig":    ParacrossActionNodeGroupApply,
-		"SelfStageConfig":    ParacrossActionSelfStageConfig,
-		"ParaBindMiner":      ParacrossActionParaBindMiner,
+		"Commit":                     ParacrossActionCommit,
+		"Miner":                      ParacrossActionMiner,
+		"AssetTransfer":              ParacrossActionAssetTransfer,
+		"AssetWithdraw":              ParacrossActionAssetWithdraw,
+		"Transfer":                   ParacrossActionTransfer,
+		"Withdraw":                   ParacrossActionWithdraw,
+		"TransferToExec":             ParacrossActionTransferToExec,
+		"CrossAssetTransfer":         ParacrossActionCrossAssetTransfer,
+		"NodeConfig":                 ParacrossActionNodeConfig,
+		"NodeGroupConfig":            ParacrossActionNodeGroupApply,
+		"SelfStageConfig":            ParacrossActionSelfStageConfig,
+		"ParaBindMiner":              ParacrossActionParaBindMiner,
+		"SupervisionNodeGroupConfig": ParacrossActionSupervisionNodeGroupConfig,
 	}
 }