Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
d5210ee3
Commit
d5210ee3
authored
Apr 28, 2019
by
mdj33
Committed by
vipwzw
May 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linter error
parent
0f0b02ce
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
29 additions
and
28 deletions
+29
-28
paracross.go
plugin/dapp/paracross/commands/paracross.go
+2
-2
exec.go
plugin/dapp/paracross/executor/exec.go
+1
-0
query.go
plugin/dapp/paracross/executor/query.go
+3
-3
superaccount.go
plugin/dapp/paracross/executor/superaccount.go
+6
-5
superaccount_test.go
plugin/dapp/paracross/executor/superaccount_test.go
+4
-9
rpc.go
plugin/dapp/paracross/rpc/rpc.go
+6
-6
errors.go
plugin/dapp/paracross/types/errors.go
+2
-2
paracross.go
plugin/dapp/paracross/types/paracross.go
+5
-1
No files found.
plugin/dapp/paracross/commands/paracross.go
View file @
d5210ee3
...
...
@@ -563,7 +563,7 @@ func nodeGroup(cmd *cobra.Command, args []string) {
ctx
.
Run
()
}
//
GetNodeGroup
Cmd get node group addr
//
NodeGroupStatus
Cmd get node group addr
func
NodeGroupStatusCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"nodegroup_status"
,
...
...
@@ -593,7 +593,7 @@ func nodeGroupStatus(cmd *cobra.Command, args []string) {
ctx
.
Run
()
}
//
GetNodeGroup
Cmd get node group addr
//
NodeGroupList
Cmd get node group addr
func
NodeGroupListCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"nodegroup_list"
,
...
...
plugin/dapp/paracross/executor/exec.go
View file @
d5210ee3
...
...
@@ -93,6 +93,7 @@ func (e *Paracross) Exec_NodeConfig(payload *pt.ParaNodeAddrConfig, tx *types.Tr
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
)
{
a
:=
newAction
(
e
,
tx
)
return
a
.
NodeGroupConfig
(
payload
)
...
...
plugin/dapp/paracross/executor/query.go
View file @
d5210ee3
...
...
@@ -35,7 +35,7 @@ func (p *Paracross) Query_GetTitleByHash(in *pt.ReqParacrossTitleHash) (types.Me
return
p
.
paracrossGetHeight
(
in
.
GetTitle
())
}
//Query_GetNodeGroup get node group addrs
//Query_GetNodeGroup
Addrs
get node group addrs
func
(
p
*
Paracross
)
Query_GetNodeGroupAddrs
(
in
*
pt
.
ReqParacrossNodeInfo
)
(
types
.
Message
,
error
)
{
if
in
==
nil
{
return
nil
,
types
.
ErrInvalidParam
...
...
@@ -76,7 +76,7 @@ func (p *Paracross) Query_ListNodeStatusInfo(in *pt.ReqParacrossNodeInfo) (types
return
listLocalNodeStatus
(
p
.
GetLocalDB
(),
in
.
Title
,
in
.
Status
)
}
//Query_GetNode
AddrInfo
get specific node addr info
//Query_GetNode
GroupStatus
get specific node addr info
func
(
p
*
Paracross
)
Query_GetNodeGroupStatus
(
in
*
pt
.
ReqParacrossNodeInfo
)
(
types
.
Message
,
error
)
{
if
in
==
nil
||
in
.
Title
==
""
{
return
nil
,
types
.
ErrInvalidParam
...
...
@@ -89,7 +89,7 @@ func (p *Paracross) Query_GetNodeGroupStatus(in *pt.ReqParacrossNodeInfo) (types
return
stat
,
nil
}
//Query_ListNode
StatusInfo
list node info by status
//Query_ListNode
GroupStatus
list node info by status
func
(
p
*
Paracross
)
Query_ListNodeGroupStatus
(
in
*
pt
.
ReqParacrossNodeInfo
)
(
types
.
Message
,
error
)
{
if
in
==
nil
||
in
.
Status
==
0
{
return
nil
,
types
.
ErrInvalidParam
...
...
plugin/dapp/paracross/executor/superaccount.go
View file @
d5210ee3
...
...
@@ -721,7 +721,7 @@ func (a *action) nodeGroupCreate(title string, nodes []string, coinFrozen int64)
return
receipt
,
nil
}
//Node
Config support super account node
config
//Node
GroupConfig support super node group
config
func
(
a
*
action
)
NodeGroupConfig
(
config
*
pt
.
ParaNodeGroupApply
)
(
*
types
.
Receipt
,
error
)
{
if
!
validTitle
(
config
.
Title
)
{
return
nil
,
pt
.
ErrInvalidTitle
...
...
@@ -755,9 +755,10 @@ func (a *action) NodeGroupConfig(config *pt.ParaNodeGroupApply) (*types.Receipt,
return
nil
,
types
.
ErrNotAllow
}
return
a
.
nodeGroupQuit
(
config
)
}
else
{
return
nil
,
pt
.
ErrParaUnSupportNodeOper
}
return
nil
,
pt
.
ErrParaUnSupportNodeOper
}
//NodeConfig support super account node config
...
...
@@ -780,8 +781,8 @@ func (a *action) NodeConfig(config *pt.ParaNodeAddrConfig) (*types.Receipt, erro
}
else
if
config
.
Op
==
pt
.
ParaNodeVote
{
return
a
.
nodeVote
(
config
)
}
else
{
return
nil
,
pt
.
ErrParaUnSupportNodeOper
}
return
nil
,
pt
.
ErrParaUnSupportNodeOper
}
plugin/dapp/paracross/executor/superaccount_test.go
View file @
d5210ee3
...
...
@@ -168,10 +168,6 @@ func checkVoteReceipt(suite *NodeManageTestSuite, receipt *types.Receipt, count
err
:=
types
.
Decode
(
receipt
.
KV
[
0
]
.
Value
,
&
stat
)
assert
.
Nil
(
suite
.
T
(),
err
,
"decode ParaNodeAddrStatus failed"
)
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) {
}
func
(
suite
*
NodeManageTestSuite
)
testNodeGroupConfig
()
{
//title := types.GetTitle()
config
:=
&
pt
.
ParaNodeGroupApply
{
Addrs
:
applyAddrs
,
Op
:
pt
.
ParacrossNodeGroupApply
,
...
...
@@ -268,9 +263,9 @@ func (suite *NodeManageTestSuite) testNodeConfig() {
voteTest
(
suite
,
Account1MC
,
false
)
}
func
(
s
*
NodeManageTestSuite
)
TestExec
()
{
s
.
testNodeGroupConfig
()
s
.
testNodeConfig
()
func
(
s
uite
*
NodeManageTestSuite
)
TestExec
()
{
s
uite
.
testNodeGroupConfig
()
s
uite
.
testNodeConfig
()
}
...
...
@@ -283,6 +278,6 @@ func TestNodeManageSuite(t *testing.T) {
types
.
SetTitleOnlyForTest
(
tempTitle
)
}
func
(
s
*
NodeManageTestSuite
)
TearDownSuite
()
{
func
(
s
uite
*
NodeManageTestSuite
)
TearDownSuite
()
{
}
plugin/dapp/paracross/rpc/rpc.go
View file @
d5210ee3
...
...
@@ -208,7 +208,7 @@ func (c *Jrpc) ListNodeStatus(req *pt.ReqParacrossNodeInfo, result *interface{})
return
err
}
// GetNodeGroup
get super node group
// GetNodeGroup
Addrs get super node group addrs
func
(
c
*
channelClient
)
GetNodeGroupAddrs
(
ctx
context
.
Context
,
req
*
pt
.
ReqParacrossNodeInfo
)
(
*
types
.
ReplyConfig
,
error
)
{
r
:=
*
req
data
,
err
:=
c
.
Query
(
pt
.
GetExecName
(),
"GetNodeGroupAddrs"
,
&
r
)
...
...
@@ -221,14 +221,14 @@ func (c *channelClient) GetNodeGroupAddrs(ctx context.Context, req *pt.ReqParacr
return
nil
,
types
.
ErrDecode
}
// GetNodeGroup
get super node group
// GetNodeGroup
Addrs get super node group addrs
func
(
c
*
Jrpc
)
GetNodeGroupAddrs
(
req
*
pt
.
ReqParacrossNodeInfo
,
result
*
interface
{})
error
{
data
,
err
:=
c
.
cli
.
GetNodeGroupAddrs
(
context
.
Background
(),
req
)
*
result
=
data
return
err
}
// GetNodeGroup
get super node group
// GetNodeGroup
Status get super node group status
func
(
c
*
channelClient
)
GetNodeGroupStatus
(
ctx
context
.
Context
,
req
*
pt
.
ReqParacrossNodeInfo
)
(
*
pt
.
ParaNodeAddrStatus
,
error
)
{
r
:=
*
req
data
,
err
:=
c
.
Query
(
pt
.
GetExecName
(),
"GetNodeGroupStatus"
,
&
r
)
...
...
@@ -241,14 +241,14 @@ func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParac
return
nil
,
types
.
ErrDecode
}
// GetNodeGroup
get super node group
// GetNodeGroup
Status get super node group status
func
(
c
*
Jrpc
)
GetNodeGroupStatus
(
req
*
pt
.
ReqParacrossNodeInfo
,
result
*
interface
{})
error
{
data
,
err
:=
c
.
cli
.
GetNodeGroupStatus
(
context
.
Background
(),
req
)
*
result
=
data
return
err
}
//ListNode
Status list super node
by status
//ListNode
GroupStatus list super node group
by status
func
(
c
*
channelClient
)
ListNodeGroupStatus
(
ctx
context
.
Context
,
req
*
pt
.
ReqParacrossNodeInfo
)
(
*
pt
.
RespParacrossNodeAddrs
,
error
)
{
r
:=
*
req
data
,
err
:=
c
.
Query
(
pt
.
GetExecName
(),
"ListNodeGroupStatus"
,
&
r
)
...
...
@@ -261,7 +261,7 @@ func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqPara
return
nil
,
types
.
ErrDecode
}
//ListNode
Status list super node
by status
//ListNode
GroupStatus list super node group
by status
func
(
c
*
Jrpc
)
ListNodeGroupStatus
(
req
*
pt
.
ReqParacrossNodeInfo
,
result
*
interface
{})
error
{
data
,
err
:=
c
.
cli
.
ListNodeGroupStatus
(
context
.
Background
(),
req
)
*
result
=
data
...
...
plugin/dapp/paracross/types/errors.go
View file @
d5210ee3
...
...
@@ -43,10 +43,10 @@ var (
ErrParaNodeGroupLastAddr
=
errors
.
New
(
"ErrParaNodeGroupLastAddr"
)
//ErrParaNodeVoteSelf vote self not allow
ErrParaNodeVoteSelf
=
errors
.
New
(
"ErrParaNodeVoteSelf"
)
//ErrParaNodeGroup
LessFrozenCoins
node group coins in tx less than conf's minimum coins
//ErrParaNodeGroup
FrozenCoinsNotEnough
node group coins in tx less than conf's minimum coins
ErrParaNodeGroupFrozenCoinsNotEnough
=
errors
.
New
(
"ErrParaNodeGroupFrozenCoinsNotEnough"
)
//ErrParaNodeGroupStatusWrong node group process wrong status
ErrParaNodeGroupStatusWrong
=
errors
.
New
(
"ErrParaNodeGroupStatusWrong"
)
//ErrParaNodeGroupAddrNotMatch
//ErrParaNodeGroupAddrNotMatch
group addrs not match with apply
ErrParaNodeGroupAddrNotMatch
=
errors
.
New
(
"ErrParaNodeGroupAddrNotMatch"
)
)
plugin/dapp/paracross/types/paracross.go
View file @
d5210ee3
...
...
@@ -75,7 +75,7 @@ const (
ParacrossActionAssetWithdraw
//ParacrossActionNodeConfig para super node config
ParacrossActionNodeConfig
//ParacrossActionNodeGroupApply
//ParacrossActionNodeGroupApply
apply for node group initially
ParacrossActionNodeGroupApply
)
...
...
@@ -109,8 +109,11 @@ const (
)
const
(
//ParacrossNodeGroupApply apply for para chain node group initially
ParacrossNodeGroupApply
=
iota
+
1
//ParacrossNodeGroupApprove super manager approve the apply
ParacrossNodeGroupApprove
//ParacrossNodeGroupQuit applyer quit the apply when not be approved
ParacrossNodeGroupQuit
)
...
...
@@ -186,6 +189,7 @@ func CreateRawNodeConfigTx(config *ParaNodeAddrConfig) (*types.Transaction, erro
return
tx
,
nil
}
//CreateRawNodeGroupApplyTx create raw tx for node group
func
CreateRawNodeGroupApplyTx
(
apply
*
ParaNodeGroupApply
)
(
*
types
.
Transaction
,
error
)
{
apply
.
Title
=
types
.
GetTitle
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment