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
c3582839
Commit
c3582839
authored
Jan 25, 2019
by
linj
Committed by
vipwzw
Jan 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fmt & linter
parent
cb38e7ca
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
exec.go
plugin/dapp/unfreeze/executor/exec.go
+1
-1
localdb.go
plugin/dapp/unfreeze/executor/localdb.go
+3
-3
means_test.go
plugin/dapp/unfreeze/executor/means_test.go
+1
-1
query.go
plugin/dapp/unfreeze/executor/query.go
+5
-1
No files found.
plugin/dapp/unfreeze/executor/exec.go
View file @
c3582839
...
...
@@ -203,7 +203,7 @@ func (u *Unfreeze) terminator(unfreeze *pty.Unfreeze) (int64, *types.Receipt, er
}
unfreezeOld
:=
*
unfreeze
amount
:=
int64
(
0
)
var
amount
int64
if
types
.
IsDappFork
(
u
.
GetHeight
(),
pty
.
UnfreezeX
,
"ForkTerminatePart"
)
{
if
unfreeze
.
Terminated
{
return
0
,
nil
,
pty
.
ErrTerminated
...
...
plugin/dapp/unfreeze/executor/localdb.go
View file @
c3582839
...
...
@@ -26,12 +26,12 @@ var opt_addr_table = &table.Option{
},
}
//
Orde
rRow order row
//
Add
rRow order row
type
AddrRow
struct
{
*
pty
.
LocalUnfreeze
}
// New
Orde
rRow create row
// New
Add
rRow create row
func
NewAddrRow
()
*
AddrRow
{
return
&
AddrRow
{
LocalUnfreeze
:
nil
}
}
...
...
@@ -66,7 +66,7 @@ func (r *AddrRow) Get(key string) ([]byte, error) {
}
}
// New
Orde
rTable create order table
// New
Add
rTable create order table
func
NewAddrTable
(
kvdb
dbm
.
KV
)
*
table
.
Table
{
rowMeta
:=
NewAddrRow
()
rowMeta
.
SetPayload
(
&
pty
.
LocalUnfreeze
{})
...
...
plugin/dapp/unfreeze/executor/means_test.go
View file @
c3582839
...
...
@@ -9,7 +9,7 @@ import (
)
func
TestCalcFrozen
(
t
*
testing
.
T
)
{
m
,
err
:=
newMeans
(
"LeftProportion"
)
m
,
err
:=
newMeans
(
"LeftProportion"
,
1
)
assert
.
Nil
(
t
,
err
)
assert
.
NotNil
(
t
,
m
)
...
...
plugin/dapp/unfreeze/executor/query.go
View file @
c3582839
...
...
@@ -23,11 +23,12 @@ func (u *Unfreeze) Query_GetUnfreeze(in *types.ReqString) (types.Message, error)
return
QueryUnfreeze
(
u
.
GetStateDB
(),
in
.
GetData
())
}
// Query_ListUnfreeze
查询合约可提币量
// Query_ListUnfreeze
ByCreator 查询列表
func
(
u
*
Unfreeze
)
Query_ListUnfreezeByCreator
(
in
*
pty
.
ReqUnfreezes
)
(
types
.
Message
,
error
)
{
return
ListUnfreezeByCreator
(
u
.
GetLocalDB
(),
in
)
}
// Query_ListUnfreezeByBeneficiary 查询列表
func
(
u
*
Unfreeze
)
Query_ListUnfreezeByBeneficiary
(
in
*
pty
.
ReqUnfreezes
)
(
types
.
Message
,
error
)
{
return
ListUnfreezeByBeneficiary
(
u
.
GetLocalDB
(),
in
)
}
...
...
@@ -74,6 +75,7 @@ func QueryUnfreeze(stateDB dbm.KV, unfreezeID string) (types.Message, error) {
return
unfreeze
,
nil
}
// ListUnfreezeByCreator 查询列表实现
func
ListUnfreezeByCreator
(
ldb
dbm
.
KVDB
,
req
*
pty
.
ReqUnfreezes
)
(
types
.
Message
,
error
)
{
if
len
(
req
.
Initiator
)
==
0
{
return
nil
,
types
.
ErrInvalidParam
...
...
@@ -94,6 +96,7 @@ func ListUnfreezeByCreator(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message,
return
fmtLocalUnfreeze
(
rows
)
}
// ListUnfreezeByBeneficiary 查询列表实现
func
ListUnfreezeByBeneficiary
(
ldb
dbm
.
KVDB
,
req
*
pty
.
ReqUnfreezes
)
(
types
.
Message
,
error
)
{
if
len
(
req
.
Beneficiary
)
==
0
{
return
nil
,
types
.
ErrInvalidParam
...
...
@@ -105,6 +108,7 @@ func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Messa
u
.
TxIndex
=
req
.
FromKey
}
uflog
.
Error
(
"ListUnfreezeByBeneficiary "
,
"params"
,
req
)
rows
,
err
:=
list
(
ldb
,
"beneficiary"
,
u
,
req
.
Count
,
req
.
Direction
)
if
err
!=
nil
{
uflog
.
Error
(
"ListUnfreezeByBeneficiary "
,
"err"
,
err
,
"params"
,
req
)
...
...
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