Commit d576ed68 authored by linj's avatar linj Committed by linj

init unfreeze

parent 565bd2fd
......@@ -125,12 +125,12 @@ func (a *action) UnfreezeTerminate(terminate *uf.UnfreezeTerminate) (*types.Rece
return nil, err
}
if a.fromaddr != unfreeze.Initiator {
uflog.Error("unfreeze terminate ", "execaddr", a.execaddr, "err", types.ErrUnfreezeID)
return nil, types.ErrUnfreezeID
uflog.Error("unfreeze terminate ", "execaddr", a.execaddr, "err", uf.ErrUnfreezeID)
return nil, uf.ErrUnfreezeID
}
if unfreeze.Remaining <= 0 {
uflog.Error("unfreeze terminate ", "execaddr", a.execaddr, "err", types.ErrUnfreezeEmptied)
return nil, types.ErrUnfreezeEmptied
uflog.Error("unfreeze terminate ", "execaddr", a.execaddr, "err", uf.ErrUnfreezeEmptied)
return nil, uf.ErrUnfreezeEmptied
}
tokenAccDB, err := account.NewAccountDB("token", unfreeze.TokenName, a.db)
if err != nil {
......@@ -208,10 +208,10 @@ func getWithdrawAvailable(unfreeze uf.Unfreeze) (int64, int64, error) {
expectTimes := (currentTime + unfreeze.Period - unfreeze.StartTime) / unfreeze.Period
reaTimes := expectTimes - int64(unfreeze.WithdrawTimes)
if reaTimes <= 0 {
return 0, 0, types.ErrUnfreezeBeforeDue
return 0, 0, uf.ErrUnfreezeBeforeDue
}
if unfreeze.Remaining <= 0 {
return 0, 0, types.ErrUnfreezeEmptied
return 0, 0, uf.ErrUnfreezeEmptied
}
var available int64
......@@ -234,7 +234,7 @@ func getWithdrawAvailable(unfreeze uf.Unfreeze) (int64, int64, error) {
available += unfreeze.Amount
}
default:
return 0, 0, types.ErrUnfreezeMeans
return 0, 0, uf.ErrUnfreezeMeans
}
return reaTimes, available, nil
}
......@@ -18,7 +18,7 @@ func init() {
ety.InitFuncList(types.ListMethod(&Unfreeze{}))
}
func Init(name string) {
func Init(name string, sub []byte) {
drivers.Register(GetName(), newUnfreeze, 0)
}
......
......@@ -3,7 +3,7 @@ package unfreeze
import (
"gitlab.33.cn/chain33/chain33/plugin/dapp/unfreeze/commands"
uf "gitlab.33.cn/chain33/chain33/plugin/dapp/unfreeze/types"
"gitlab.33.cn/chain33/chain33/plugin/dapp/v/executor"
"gitlab.33.cn/chain33/chain33/plugin/dapp/unfreeze/executor"
"gitlab.33.cn/chain33/chain33/pluginmgr"
)
......
......@@ -65,7 +65,7 @@ func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.T
err := json.Unmarshal(message, &param)
if err != nil {
tlog.Error("CreateTx", "Error", err)
return nil, types.ErrInputPara
return nil, types.ErrInvalidParam
}
return CreateUnfreezeCreateTx(&param)
} else if action == Action_WithdrawUnfreeze {
......@@ -73,7 +73,7 @@ func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.T
err := json.Unmarshal(message, &param)
if err != nil {
tlog.Error("CreateTx", "Error", err)
return nil, types.ErrInputPara
return nil, types.ErrInvalidParam
}
return CreateUnfreezeWithdrawTx(&param)
} else if action == Action_TerminateUnfreeze {
......@@ -81,7 +81,7 @@ func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.T
err := json.Unmarshal(message, &param)
if err != nil {
tlog.Error("CreateTx", "Error", err)
return nil, types.ErrInputPara
return nil, types.ErrInvalidParam
}
return CreateUnfreezeTerminateTx(&param)
} else {
......
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