Commit d5210ee3 authored by mdj33's avatar mdj33 Committed by vipwzw

linter error

parent 0f0b02ce
...@@ -563,7 +563,7 @@ func nodeGroup(cmd *cobra.Command, args []string) { ...@@ -563,7 +563,7 @@ func nodeGroup(cmd *cobra.Command, args []string) {
ctx.Run() ctx.Run()
} }
// GetNodeGroupCmd get node group addr // NodeGroupStatusCmd get node group addr
func NodeGroupStatusCmd() *cobra.Command { func NodeGroupStatusCmd() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "nodegroup_status", Use: "nodegroup_status",
...@@ -593,7 +593,7 @@ func nodeGroupStatus(cmd *cobra.Command, args []string) { ...@@ -593,7 +593,7 @@ func nodeGroupStatus(cmd *cobra.Command, args []string) {
ctx.Run() ctx.Run()
} }
// GetNodeGroupCmd get node group addr // NodeGroupListCmd get node group addr
func NodeGroupListCmd() *cobra.Command { func NodeGroupListCmd() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "nodegroup_list", Use: "nodegroup_list",
......
...@@ -93,6 +93,7 @@ func (e *Paracross) Exec_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *types.Tr ...@@ -93,6 +93,7 @@ func (e *Paracross) Exec_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *types.Tr
return a.NodeConfig(payload) return a.NodeConfig(payload)
} }
//Exec_NodeGroupConfig node group config process
func (e *Paracross) Exec_NodeGroupConfig(payload *pt.ParaNodeGroupApply, tx *types.Transaction, index int) (*types.Receipt, error) { func (e *Paracross) Exec_NodeGroupConfig(payload *pt.ParaNodeGroupApply, tx *types.Transaction, index int) (*types.Receipt, error) {
a := newAction(e, tx) a := newAction(e, tx)
return a.NodeGroupConfig(payload) return a.NodeGroupConfig(payload)
......
...@@ -35,7 +35,7 @@ func (p *Paracross) Query_GetTitleByHash(in *pt.ReqParacrossTitleHash) (types.Me ...@@ -35,7 +35,7 @@ func (p *Paracross) Query_GetTitleByHash(in *pt.ReqParacrossTitleHash) (types.Me
return p.paracrossGetHeight(in.GetTitle()) return p.paracrossGetHeight(in.GetTitle())
} }
//Query_GetNodeGroup get node group addrs //Query_GetNodeGroupAddrs get node group addrs
func (p *Paracross) Query_GetNodeGroupAddrs(in *pt.ReqParacrossNodeInfo) (types.Message, error) { func (p *Paracross) Query_GetNodeGroupAddrs(in *pt.ReqParacrossNodeInfo) (types.Message, error) {
if in == nil { if in == nil {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
...@@ -76,7 +76,7 @@ func (p *Paracross) Query_ListNodeStatusInfo(in *pt.ReqParacrossNodeInfo) (types ...@@ -76,7 +76,7 @@ func (p *Paracross) Query_ListNodeStatusInfo(in *pt.ReqParacrossNodeInfo) (types
return listLocalNodeStatus(p.GetLocalDB(), in.Title, in.Status) return listLocalNodeStatus(p.GetLocalDB(), in.Title, in.Status)
} }
//Query_GetNodeAddrInfo get specific node addr info //Query_GetNodeGroupStatus get specific node addr info
func (p *Paracross) Query_GetNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types.Message, error) { func (p *Paracross) Query_GetNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types.Message, error) {
if in == nil || in.Title == "" { if in == nil || in.Title == "" {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
...@@ -89,7 +89,7 @@ func (p *Paracross) Query_GetNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types ...@@ -89,7 +89,7 @@ func (p *Paracross) Query_GetNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types
return stat, nil return stat, nil
} }
//Query_ListNodeStatusInfo list node info by status //Query_ListNodeGroupStatus list node info by status
func (p *Paracross) Query_ListNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types.Message, error) { func (p *Paracross) Query_ListNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types.Message, error) {
if in == nil || in.Status == 0 { if in == nil || in.Status == 0 {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
......
...@@ -721,7 +721,7 @@ func (a *action) nodeGroupCreate(title string, nodes []string, coinFrozen int64) ...@@ -721,7 +721,7 @@ func (a *action) nodeGroupCreate(title string, nodes []string, coinFrozen int64)
return receipt, nil return receipt, nil
} }
//NodeConfig support super account node config //NodeGroupConfig support super node group config
func (a *action) NodeGroupConfig(config *pt.ParaNodeGroupApply) (*types.Receipt, error) { func (a *action) NodeGroupConfig(config *pt.ParaNodeGroupApply) (*types.Receipt, error) {
if !validTitle(config.Title) { if !validTitle(config.Title) {
return nil, pt.ErrInvalidTitle return nil, pt.ErrInvalidTitle
...@@ -755,9 +755,10 @@ func (a *action) NodeGroupConfig(config *pt.ParaNodeGroupApply) (*types.Receipt, ...@@ -755,9 +755,10 @@ func (a *action) NodeGroupConfig(config *pt.ParaNodeGroupApply) (*types.Receipt,
return nil, types.ErrNotAllow return nil, types.ErrNotAllow
} }
return a.nodeGroupQuit(config) return a.nodeGroupQuit(config)
} else {
return nil, pt.ErrParaUnSupportNodeOper
} }
return nil, pt.ErrParaUnSupportNodeOper
} }
//NodeConfig support super account node config //NodeConfig support super account node config
...@@ -780,8 +781,8 @@ func (a *action) NodeConfig(config *pt.ParaNodeAddrConfig) (*types.Receipt, erro ...@@ -780,8 +781,8 @@ func (a *action) NodeConfig(config *pt.ParaNodeAddrConfig) (*types.Receipt, erro
} else if config.Op == pt.ParaNodeVote { } else if config.Op == pt.ParaNodeVote {
return a.nodeVote(config) return a.nodeVote(config)
} else {
return nil, pt.ErrParaUnSupportNodeOper
} }
return nil, pt.ErrParaUnSupportNodeOper
} }
...@@ -168,10 +168,6 @@ func checkVoteReceipt(suite *NodeManageTestSuite, receipt *types.Receipt, count ...@@ -168,10 +168,6 @@ func checkVoteReceipt(suite *NodeManageTestSuite, receipt *types.Receipt, count
err := types.Decode(receipt.KV[0].Value, &stat) err := types.Decode(receipt.KV[0].Value, &stat)
assert.Nil(suite.T(), err, "decode ParaNodeAddrStatus failed") assert.Nil(suite.T(), err, "decode ParaNodeAddrStatus failed")
assert.Len(suite.T(), stat.Votes.Votes, count) assert.Len(suite.T(), stat.Votes.Votes, count)
////suite.T().Log("titleHeight", titleHeight)
//assert.Equal(suite.T(), int32(pt.TyLogParaNodeConfig), receipt.Logs[0].Ty)
//assert.Equal(suite.T(), int32(pt.ParacrossNodeAdding), stat.Status)
//assert.NotNil(suite.T(), stat.Votes)
} }
...@@ -216,7 +212,6 @@ func voteTest(suite *NodeManageTestSuite, addr string, join bool) { ...@@ -216,7 +212,6 @@ func voteTest(suite *NodeManageTestSuite, addr string, join bool) {
} }
func (suite *NodeManageTestSuite) testNodeGroupConfig() { func (suite *NodeManageTestSuite) testNodeGroupConfig() {
//title := types.GetTitle()
config := &pt.ParaNodeGroupApply{ config := &pt.ParaNodeGroupApply{
Addrs: applyAddrs, Addrs: applyAddrs,
Op: pt.ParacrossNodeGroupApply, Op: pt.ParacrossNodeGroupApply,
...@@ -268,9 +263,9 @@ func (suite *NodeManageTestSuite) testNodeConfig() { ...@@ -268,9 +263,9 @@ func (suite *NodeManageTestSuite) testNodeConfig() {
voteTest(suite, Account1MC, false) voteTest(suite, Account1MC, false)
} }
func (s *NodeManageTestSuite) TestExec() { func (suite *NodeManageTestSuite) TestExec() {
s.testNodeGroupConfig() suite.testNodeGroupConfig()
s.testNodeConfig() suite.testNodeConfig()
} }
...@@ -283,6 +278,6 @@ func TestNodeManageSuite(t *testing.T) { ...@@ -283,6 +278,6 @@ func TestNodeManageSuite(t *testing.T) {
types.SetTitleOnlyForTest(tempTitle) types.SetTitleOnlyForTest(tempTitle)
} }
func (s *NodeManageTestSuite) TearDownSuite() { func (suite *NodeManageTestSuite) TearDownSuite() {
} }
...@@ -208,7 +208,7 @@ func (c *Jrpc) ListNodeStatus(req *pt.ReqParacrossNodeInfo, result *interface{}) ...@@ -208,7 +208,7 @@ func (c *Jrpc) ListNodeStatus(req *pt.ReqParacrossNodeInfo, result *interface{})
return err return err
} }
// GetNodeGroup get super node group // GetNodeGroupAddrs get super node group addrs
func (c *channelClient) GetNodeGroupAddrs(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*types.ReplyConfig, error) { func (c *channelClient) GetNodeGroupAddrs(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*types.ReplyConfig, error) {
r := *req r := *req
data, err := c.Query(pt.GetExecName(), "GetNodeGroupAddrs", &r) data, err := c.Query(pt.GetExecName(), "GetNodeGroupAddrs", &r)
...@@ -221,14 +221,14 @@ func (c *channelClient) GetNodeGroupAddrs(ctx context.Context, req *pt.ReqParacr ...@@ -221,14 +221,14 @@ func (c *channelClient) GetNodeGroupAddrs(ctx context.Context, req *pt.ReqParacr
return nil, types.ErrDecode return nil, types.ErrDecode
} }
// GetNodeGroup get super node group // GetNodeGroupAddrs get super node group addrs
func (c *Jrpc) GetNodeGroupAddrs(req *pt.ReqParacrossNodeInfo, result *interface{}) error { func (c *Jrpc) GetNodeGroupAddrs(req *pt.ReqParacrossNodeInfo, result *interface{}) error {
data, err := c.cli.GetNodeGroupAddrs(context.Background(), req) data, err := c.cli.GetNodeGroupAddrs(context.Background(), req)
*result = data *result = data
return err return err
} }
// GetNodeGroup get super node group // GetNodeGroupStatus get super node group status
func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.ParaNodeAddrStatus, error) { func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.ParaNodeAddrStatus, error) {
r := *req r := *req
data, err := c.Query(pt.GetExecName(), "GetNodeGroupStatus", &r) data, err := c.Query(pt.GetExecName(), "GetNodeGroupStatus", &r)
...@@ -241,14 +241,14 @@ func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParac ...@@ -241,14 +241,14 @@ func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParac
return nil, types.ErrDecode return nil, types.ErrDecode
} }
// GetNodeGroup get super node group // GetNodeGroupStatus get super node group status
func (c *Jrpc) GetNodeGroupStatus(req *pt.ReqParacrossNodeInfo, result *interface{}) error { func (c *Jrpc) GetNodeGroupStatus(req *pt.ReqParacrossNodeInfo, result *interface{}) error {
data, err := c.cli.GetNodeGroupStatus(context.Background(), req) data, err := c.cli.GetNodeGroupStatus(context.Background(), req)
*result = data *result = data
return err return err
} }
//ListNodeStatus list super node by status //ListNodeGroupStatus list super node group by status
func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.RespParacrossNodeAddrs, error) { func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.RespParacrossNodeAddrs, error) {
r := *req r := *req
data, err := c.Query(pt.GetExecName(), "ListNodeGroupStatus", &r) data, err := c.Query(pt.GetExecName(), "ListNodeGroupStatus", &r)
...@@ -261,7 +261,7 @@ func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqPara ...@@ -261,7 +261,7 @@ func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqPara
return nil, types.ErrDecode return nil, types.ErrDecode
} }
//ListNodeStatus list super node by status //ListNodeGroupStatus list super node group by status
func (c *Jrpc) ListNodeGroupStatus(req *pt.ReqParacrossNodeInfo, result *interface{}) error { func (c *Jrpc) ListNodeGroupStatus(req *pt.ReqParacrossNodeInfo, result *interface{}) error {
data, err := c.cli.ListNodeGroupStatus(context.Background(), req) data, err := c.cli.ListNodeGroupStatus(context.Background(), req)
*result = data *result = data
......
...@@ -43,10 +43,10 @@ var ( ...@@ -43,10 +43,10 @@ var (
ErrParaNodeGroupLastAddr = errors.New("ErrParaNodeGroupLastAddr") ErrParaNodeGroupLastAddr = errors.New("ErrParaNodeGroupLastAddr")
//ErrParaNodeVoteSelf vote self not allow //ErrParaNodeVoteSelf vote self not allow
ErrParaNodeVoteSelf = errors.New("ErrParaNodeVoteSelf") ErrParaNodeVoteSelf = errors.New("ErrParaNodeVoteSelf")
//ErrParaNodeGroupLessFrozenCoins node group coins in tx less than conf's minimum coins //ErrParaNodeGroupFrozenCoinsNotEnough node group coins in tx less than conf's minimum coins
ErrParaNodeGroupFrozenCoinsNotEnough = errors.New("ErrParaNodeGroupFrozenCoinsNotEnough") ErrParaNodeGroupFrozenCoinsNotEnough = errors.New("ErrParaNodeGroupFrozenCoinsNotEnough")
//ErrParaNodeGroupStatusWrong node group process wrong status //ErrParaNodeGroupStatusWrong node group process wrong status
ErrParaNodeGroupStatusWrong = errors.New("ErrParaNodeGroupStatusWrong") ErrParaNodeGroupStatusWrong = errors.New("ErrParaNodeGroupStatusWrong")
//ErrParaNodeGroupAddrNotMatch //ErrParaNodeGroupAddrNotMatch group addrs not match with apply
ErrParaNodeGroupAddrNotMatch = errors.New("ErrParaNodeGroupAddrNotMatch") ErrParaNodeGroupAddrNotMatch = errors.New("ErrParaNodeGroupAddrNotMatch")
) )
...@@ -75,7 +75,7 @@ const ( ...@@ -75,7 +75,7 @@ const (
ParacrossActionAssetWithdraw ParacrossActionAssetWithdraw
//ParacrossActionNodeConfig para super node config //ParacrossActionNodeConfig para super node config
ParacrossActionNodeConfig ParacrossActionNodeConfig
//ParacrossActionNodeGroupApply //ParacrossActionNodeGroupApply apply for node group initially
ParacrossActionNodeGroupApply ParacrossActionNodeGroupApply
) )
...@@ -109,8 +109,11 @@ const ( ...@@ -109,8 +109,11 @@ const (
) )
const ( const (
//ParacrossNodeGroupApply apply for para chain node group initially
ParacrossNodeGroupApply = iota + 1 ParacrossNodeGroupApply = iota + 1
//ParacrossNodeGroupApprove super manager approve the apply
ParacrossNodeGroupApprove ParacrossNodeGroupApprove
//ParacrossNodeGroupQuit applyer quit the apply when not be approved
ParacrossNodeGroupQuit ParacrossNodeGroupQuit
) )
...@@ -186,6 +189,7 @@ func CreateRawNodeConfigTx(config *ParaNodeAddrConfig) (*types.Transaction, erro ...@@ -186,6 +189,7 @@ func CreateRawNodeConfigTx(config *ParaNodeAddrConfig) (*types.Transaction, erro
return tx, nil return tx, nil
} }
//CreateRawNodeGroupApplyTx create raw tx for node group
func CreateRawNodeGroupApplyTx(apply *ParaNodeGroupApply) (*types.Transaction, error) { func CreateRawNodeGroupApplyTx(apply *ParaNodeGroupApply) (*types.Transaction, error) {
apply.Title = types.GetTitle() apply.Title = types.GetTitle()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment