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
82038a3a
Commit
82038a3a
authored
Jun 05, 2019
by
mdj33
Committed by
vipwzw
Jun 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only creator can cancel id
parent
9f230517
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
testcase.sh
plugin/dapp/paracross/cmd/build/testcase.sh
+3
-3
superaccount.go
plugin/dapp/paracross/executor/superaccount.go
+10
-0
No files found.
plugin/dapp/paracross/cmd/build/testcase.sh
View file @
82038a3a
...
...
@@ -496,7 +496,7 @@ function para_create_nodegroup() {
echo
"=========== # para chain quit node group fail ============="
##quit fail
txhash
=
$(${
PARA_CLI
}
send para nodegroup
-o
3
-i
"
$id
"
-k
0x
6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
)
txhash
=
$(${
PARA_CLI
}
send para nodegroup
-o
3
-i
"
$id
"
-k
0x
d165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5
)
echo
"tx=
$txhash
"
query_tx
"
${
CLI
}
"
"
${
txhash
}
"
status
=
$(${
CLI
}
para nodegroup_status
-t
user.p.para. | jq
-r
".status"
)
...
...
@@ -607,7 +607,7 @@ function para_nodemanage_cancel_test() {
exit
1
fi
echo
"=========== # para chain node
quit
============="
echo
"=========== # para chain node
cancel
============="
id
=
$(${
PARA_CLI
}
tx query
-s
"
${
hash
}
"
| jq
-r
".receipt.logs[0].log.current.id"
)
if
[
-z
"
$id
"
]
;
then
echo
"id not found"
...
...
@@ -812,7 +812,7 @@ function para_nodemanage_node_behalf_join() {
fi
echo
"=========== # para chain node 1 cancel ============="
hash
=
$(${
PARA_CLI
}
send para node
-o
4
-i
"
$node1_id
"
-k
0x
fdf2bbff853ecff2e7b86b2a8b45726c6538ca7d1403dc94e50131ef379bdca0
)
hash
=
$(${
PARA_CLI
}
send para node
-o
4
-i
"
$node1_id
"
-k
0x
d165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5
)
echo
"
${
hash
}
"
query_tx
"
${
PARA_CLI
}
"
"
${
hash
}
"
...
...
plugin/dapp/paracross/executor/superaccount.go
View file @
82038a3a
...
...
@@ -328,6 +328,11 @@ func (a *action) nodeCancel(config *pt.ParaNodeAddrConfig) (*types.Receipt, erro
return
nil
,
err
}
//只能提案发起人撤销
if
a
.
fromaddr
!=
stat
.
FromAddr
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrNotAllow
,
"id create by:%s,not by:%s"
,
stat
.
FromAddr
,
a
.
fromaddr
)
}
if
config
.
Title
!=
stat
.
Title
{
return
nil
,
errors
.
Wrapf
(
pt
.
ErrNodeNotForTheTitle
,
"config title:%s,id title:%s"
,
config
.
Title
,
stat
.
Title
)
}
...
...
@@ -806,6 +811,11 @@ func (a *action) nodeGroupQuit(config *pt.ParaNodeGroupConfig) (*types.Receipt,
return
nil
,
err
}
//只能提案发起人撤销
if
a
.
fromaddr
!=
status
.
FromAddr
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrNotAllow
,
"id create by:%s,not by:%s"
,
status
.
FromAddr
,
a
.
fromaddr
)
}
if
config
.
Title
!=
status
.
Title
{
return
nil
,
errors
.
Wrapf
(
pt
.
ErrNodeNotForTheTitle
,
"config title:%s,id title:%s"
,
config
.
Title
,
status
.
Title
)
}
...
...
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