Commit c3582839 authored by linj's avatar linj Committed by vipwzw

fmt & linter

parent cb38e7ca
...@@ -203,7 +203,7 @@ func (u *Unfreeze) terminator(unfreeze *pty.Unfreeze) (int64, *types.Receipt, er ...@@ -203,7 +203,7 @@ func (u *Unfreeze) terminator(unfreeze *pty.Unfreeze) (int64, *types.Receipt, er
} }
unfreezeOld := *unfreeze unfreezeOld := *unfreeze
amount := int64(0) var amount int64
if types.IsDappFork(u.GetHeight(), pty.UnfreezeX, "ForkTerminatePart") { if types.IsDappFork(u.GetHeight(), pty.UnfreezeX, "ForkTerminatePart") {
if unfreeze.Terminated { if unfreeze.Terminated {
return 0, nil, pty.ErrTerminated return 0, nil, pty.ErrTerminated
......
...@@ -26,12 +26,12 @@ var opt_addr_table = &table.Option{ ...@@ -26,12 +26,12 @@ var opt_addr_table = &table.Option{
}, },
} }
// OrderRow order row // AddrRow order row
type AddrRow struct { type AddrRow struct {
*pty.LocalUnfreeze *pty.LocalUnfreeze
} }
// NewOrderRow create row // NewAddrRow create row
func NewAddrRow() *AddrRow { func NewAddrRow() *AddrRow {
return &AddrRow{LocalUnfreeze: nil} return &AddrRow{LocalUnfreeze: nil}
} }
...@@ -66,7 +66,7 @@ func (r *AddrRow) Get(key string) ([]byte, error) { ...@@ -66,7 +66,7 @@ func (r *AddrRow) Get(key string) ([]byte, error) {
} }
} }
// NewOrderTable create order table // NewAddrTable create order table
func NewAddrTable(kvdb dbm.KV) *table.Table { func NewAddrTable(kvdb dbm.KV) *table.Table {
rowMeta := NewAddrRow() rowMeta := NewAddrRow()
rowMeta.SetPayload(&pty.LocalUnfreeze{}) rowMeta.SetPayload(&pty.LocalUnfreeze{})
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
) )
func TestCalcFrozen(t *testing.T) { func TestCalcFrozen(t *testing.T) {
m, err := newMeans("LeftProportion") m, err := newMeans("LeftProportion", 1)
assert.Nil(t, err) assert.Nil(t, err)
assert.NotNil(t, m) assert.NotNil(t, m)
......
...@@ -23,11 +23,12 @@ func (u *Unfreeze) Query_GetUnfreeze(in *types.ReqString) (types.Message, error) ...@@ -23,11 +23,12 @@ func (u *Unfreeze) Query_GetUnfreeze(in *types.ReqString) (types.Message, error)
return QueryUnfreeze(u.GetStateDB(), in.GetData()) return QueryUnfreeze(u.GetStateDB(), in.GetData())
} }
// Query_ListUnfreeze 查询合约可提币量 // Query_ListUnfreezeByCreator 查询列表
func (u *Unfreeze) Query_ListUnfreezeByCreator(in *pty.ReqUnfreezes) (types.Message, error) { func (u *Unfreeze) Query_ListUnfreezeByCreator(in *pty.ReqUnfreezes) (types.Message, error) {
return ListUnfreezeByCreator(u.GetLocalDB(), in) return ListUnfreezeByCreator(u.GetLocalDB(), in)
} }
// Query_ListUnfreezeByBeneficiary 查询列表
func (u *Unfreeze) Query_ListUnfreezeByBeneficiary(in *pty.ReqUnfreezes) (types.Message, error) { func (u *Unfreeze) Query_ListUnfreezeByBeneficiary(in *pty.ReqUnfreezes) (types.Message, error) {
return ListUnfreezeByBeneficiary(u.GetLocalDB(), in) return ListUnfreezeByBeneficiary(u.GetLocalDB(), in)
} }
...@@ -74,6 +75,7 @@ func QueryUnfreeze(stateDB dbm.KV, unfreezeID string) (types.Message, error) { ...@@ -74,6 +75,7 @@ func QueryUnfreeze(stateDB dbm.KV, unfreezeID string) (types.Message, error) {
return unfreeze, nil return unfreeze, nil
} }
// ListUnfreezeByCreator 查询列表实现
func ListUnfreezeByCreator(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message, error) { func ListUnfreezeByCreator(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message, error) {
if len(req.Initiator) == 0 { if len(req.Initiator) == 0 {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
...@@ -94,6 +96,7 @@ func ListUnfreezeByCreator(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message, ...@@ -94,6 +96,7 @@ func ListUnfreezeByCreator(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message,
return fmtLocalUnfreeze(rows) return fmtLocalUnfreeze(rows)
} }
// ListUnfreezeByBeneficiary 查询列表实现
func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message, error) { func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Message, error) {
if len(req.Beneficiary) == 0 { if len(req.Beneficiary) == 0 {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
...@@ -105,6 +108,7 @@ func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Messa ...@@ -105,6 +108,7 @@ func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Messa
u.TxIndex = req.FromKey u.TxIndex = req.FromKey
} }
uflog.Error("ListUnfreezeByBeneficiary ", "params", req)
rows, err := list(ldb, "beneficiary", u, req.Count, req.Direction) rows, err := list(ldb, "beneficiary", u, req.Count, req.Direction)
if err != nil { if err != nil {
uflog.Error("ListUnfreezeByBeneficiary ", "err", err, "params", req) uflog.Error("ListUnfreezeByBeneficiary ", "err", err, "params", req)
......
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