Commit 0164c079 authored by linj's avatar linj Committed by vipwzw

rename: resp to reply

parent cbb82451
...@@ -405,7 +405,7 @@ func listUnfreeze(cmd *cobra.Command, args []string) { ...@@ -405,7 +405,7 @@ func listUnfreeze(cmd *cobra.Command, args []string) {
return return
} }
var resp pty.ReplyQueryUnfreezeWithdraw var resp pty.ReplyUnfreezes
err = cli.Call("Chain33.Query", param, &resp) err = cli.Call("Chain33.Query", param, &resp)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
......
...@@ -114,15 +114,15 @@ func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Messa ...@@ -114,15 +114,15 @@ func ListUnfreezeByBeneficiary(ldb dbm.KVDB, req *pty.ReqUnfreezes) (types.Messa
return fmtLocalUnfreeze(rows) return fmtLocalUnfreeze(rows)
} }
func fmtLocalUnfreeze(rows []*table.Row) (*pty.RespUnfreezes, error) { func fmtLocalUnfreeze(rows []*table.Row) (*pty.ReplyUnfreezes, error) {
var results pty.RespUnfreezes var results pty.ReplyUnfreezes
for _, row := range rows { for _, row := range rows {
r, ok := row.Data.(*pty.LocalUnfreeze) r, ok := row.Data.(*pty.LocalUnfreeze)
if !ok { if !ok {
uflog.Error("ListUnfreeze", "err", "bad row type") uflog.Error("ListUnfreeze", "err", "bad row type")
return nil, types.ErrDecode return nil, types.ErrDecode
} }
v := &pty.RespUnfreeze{ v := &pty.ReplyUnfreeze{
UnfreezeID: r.Unfreeze.UnfreezeID, UnfreezeID: r.Unfreeze.UnfreezeID,
StartTime: r.Unfreeze.StartTime, StartTime: r.Unfreeze.StartTime,
AssetExec: r.Unfreeze.AssetExec, AssetExec: r.Unfreeze.AssetExec,
...@@ -136,9 +136,9 @@ func fmtLocalUnfreeze(rows []*table.Row) (*pty.RespUnfreezes, error) { ...@@ -136,9 +136,9 @@ func fmtLocalUnfreeze(rows []*table.Row) (*pty.RespUnfreezes, error) {
Key: r.TxIndex, Key: r.TxIndex,
} }
if v.Means == pty.FixAmountX { if v.Means == pty.FixAmountX {
v.MeansOpt = &pty.RespUnfreeze_FixAmount{FixAmount: r.Unfreeze.GetFixAmount()} v.MeansOpt = &pty.ReplyUnfreeze_FixAmount{FixAmount: r.Unfreeze.GetFixAmount()}
} else if v.Means == pty.LeftProportionX { } else if v.Means == pty.LeftProportionX {
v.MeansOpt = &pty.RespUnfreeze_LeftProportion{LeftProportion: r.Unfreeze.GetLeftProportion()} v.MeansOpt = &pty.ReplyUnfreeze_LeftProportion{LeftProportion: r.Unfreeze.GetLeftProportion()}
} }
results.Unfreeze = append(results.Unfreeze, v) results.Unfreeze = append(results.Unfreeze, v)
} }
......
...@@ -102,7 +102,7 @@ message ReqUnfreezes { ...@@ -102,7 +102,7 @@ message ReqUnfreezes {
string beneficiary = 5; string beneficiary = 5;
} }
message RespUnfreeze { message ReplyUnfreeze {
//解冻交易ID(唯一识别码) //解冻交易ID(唯一识别码)
string unfreezeID = 1; string unfreezeID = 1;
//开始时间 //开始时间
...@@ -127,8 +127,8 @@ message RespUnfreeze { ...@@ -127,8 +127,8 @@ message RespUnfreeze {
bool terminated = 12; bool terminated = 12;
string key = 13; string key = 13;
} }
message RespUnfreezes { message ReplyUnfreezes {
repeated RespUnfreeze unfreeze = 1; repeated ReplyUnfreeze unfreeze = 1;
} }
// TODO 类型应该大写还是小写 // TODO 类型应该大写还是小写
......
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