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
4c3e8aef
Commit
4c3e8aef
authored
Dec 05, 2018
by
linj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix local exec
parent
fdc9ab2c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
3 deletions
+31
-3
exec_del_local.go
plugin/dapp/unfreeze/executor/exec_del_local.go
+0
-2
exec_local.go
plugin/dapp/unfreeze/executor/exec_local.go
+0
-1
exec_test.go
plugin/dapp/unfreeze/executor/exec_test.go
+31
-0
No files found.
plugin/dapp/unfreeze/executor/exec_del_local.go
View file @
4c3e8aef
...
...
@@ -24,8 +24,6 @@ func (u *Unfreeze) execDelLocal(receiptData *types.ReceiptData) (*types.LocalDBS
}
kv
:=
u
.
rollbackUnfreezeCreate
(
&
receipt
)
dbSet
.
KV
=
append
(
dbSet
.
KV
,
kv
...
)
default
:
return
nil
,
types
.
ErrNotSupport
}
}
return
dbSet
,
nil
...
...
plugin/dapp/unfreeze/executor/exec_local.go
View file @
4c3e8aef
...
...
@@ -25,7 +25,6 @@ func (u *Unfreeze) execLocal(receiptData *types.ReceiptData) (*types.LocalDBSet,
kv
:=
u
.
saveUnfreezeCreate
(
&
receipt
)
dbSet
.
KV
=
append
(
dbSet
.
KV
,
kv
...
)
default
:
return
nil
,
types
.
ErrNotSupport
}
}
return
dbSet
,
nil
...
...
plugin/dapp/unfreeze/executor/exec_test.go
View file @
4c3e8aef
...
...
@@ -99,6 +99,11 @@ func TestUnfreeze(t *testing.T) {
assert
.
Equal
(
t
,
total
-
p1
.
TotalCount
,
accTmp
.
Balance
)
assert
.
Equal
(
t
,
p1
.
TotalCount
,
accTmp
.
Frozen
)
receiptDate
:=
&
types
.
ReceiptData
{
Ty
:
receipt
.
Ty
,
Logs
:
receipt
.
Logs
}
set
,
err
:=
exec
.
ExecLocal
(
createTx
,
receiptDate
,
int
(
1
))
assert
.
Nil
(
t
,
err
)
assert
.
NotNil
(
t
,
set
)
// 提币
p2
:=
&
pty
.
UnfreezeWithdraw
{
UnfreezeID
:
string
(
unfreezeID
(
createTx
.
Hash
())),
...
...
@@ -127,6 +132,11 @@ func TestUnfreeze(t *testing.T) {
assert
.
Equal
(
t
,
u
.
Remaining
,
accATmp
.
Frozen
)
assert
.
Equal
(
t
,
accountB
.
Balance
+
p1
.
TotalCount
-
u
.
Remaining
,
accBTmp
.
Balance
)
receiptDate2
:=
&
types
.
ReceiptData
{
Ty
:
receipt
.
Ty
,
Logs
:
receipt
.
Logs
}
set
,
err
=
exec
.
ExecLocal
(
withdrawTx
,
receiptDate2
,
int
(
1
))
assert
.
Nil
(
t
,
err
)
assert
.
NotNil
(
t
,
set
)
// 不是受益人提币
{
p2
:=
&
pty
.
UnfreezeWithdraw
{
...
...
@@ -185,6 +195,11 @@ func TestUnfreeze(t *testing.T) {
assert
.
Equal
(
t
,
total
+
total
,
accATmp
.
Balance
+
accBTmp
.
Balance
)
assert
.
Equal
(
t
,
int64
(
0
),
accATmp
.
Frozen
)
receiptDate3
:=
&
types
.
ReceiptData
{
Ty
:
receipt
.
Ty
,
Logs
:
receipt
.
Logs
}
set
,
err
=
exec
.
ExecLocal
(
terminateTx
,
receiptDate3
,
int
(
1
))
assert
.
Nil
(
t
,
err
)
assert
.
NotNil
(
t
,
set
)
// 终止后不能继续提币
{
p2
:=
&
pty
.
UnfreezeWithdraw
{
...
...
@@ -204,6 +219,22 @@ func TestUnfreeze(t *testing.T) {
assert
.
Equal
(
t
,
pty
.
ErrUnfreezeEmptied
,
err
)
assert
.
Nil
(
t
,
receipt
)
}
req
:=
types
.
ReqString
{
Data
:
string
(
unfreezeID
(
createTx
.
Hash
()))}
_
,
err
=
exec
.
Query
(
"GetUnfreeze"
,
types
.
Encode
(
&
req
))
assert
.
Nil
(
t
,
err
)
_
,
err
=
exec
.
Query
(
"GetUnfreezeWithdraw"
,
types
.
Encode
(
&
req
))
assert
.
Nil
(
t
,
err
)
_
,
err
=
exec
.
ExecDelLocal
(
terminateTx
,
receiptDate3
,
int
(
1
))
assert
.
Nil
(
t
,
err
)
_
,
err
=
exec
.
ExecDelLocal
(
withdrawTx
,
receiptDate2
,
int
(
1
))
assert
.
Nil
(
t
,
err
)
_
,
err
=
exec
.
ExecDelLocal
(
createTx
,
receiptDate
,
int
(
1
))
assert
.
Nil
(
t
,
err
)
}
func
signTx
(
tx
*
types
.
Transaction
,
hexPrivKey
string
)
(
*
types
.
Transaction
,
error
)
{
...
...
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