fix make linter

plugin/dapp/unfreeze/commands/unfreeze.go

@@ -19,6 +19,7 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
 )
 
+// Cmd unfreeze 客户端主程序
 func Cmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "unfreeze",

plugin/dapp/unfreeze/executor/exec.go

@@ -12,8 +12,9 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
 )
 
+// Exec_Create 执行创建冻结合约
 func (u *Unfreeze) Exec_Create(payload *pty.UnfreezeCreate, tx *types.Transaction, index int) (*types.Receipt, error) {
-	if payload.AssetSymbol == "" || payload.AssetSymbol == "" || payload.TotalCount <= 0 || payload.Means == "" {
+	if payload.AssetExec == "" || payload.AssetSymbol == "" || payload.TotalCount <= 0 || payload.Means == "" {
 		return nil, types.ErrInvalidParam
 	}
 
@@ -42,9 +43,10 @@ func (u *Unfreeze) Exec_Create(payload *pty.UnfreezeCreate, tx *types.Transactio
 		return nil, err
 	}
 
-	return MergeReceipt(receipt, receipt1)
+	return mergeReceipt(receipt, receipt1)
 }
 
+// Exec_Withdraw 执行冻结合约中提币
 func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transaction, index int) (*types.Receipt, error) {
 	unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
 	if err != nil {
@@ -77,9 +79,10 @@ func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transa
 		return nil, err
 	}
 
-	return MergeReceipt(receipt, receipt1)
+	return mergeReceipt(receipt, receipt1)
 }
 
+// Exec_Terminate 执行终止冻结合约
 func (u *Unfreeze) Exec_Terminate(payload *pty.UnfreezeTerminate, tx *types.Transaction, index int) (*types.Receipt, error) {
 	unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
 	if err != nil {
@@ -107,7 +110,7 @@ func (u *Unfreeze) Exec_Terminate(payload *pty.UnfreezeTerminate, tx *types.Tran
 		uflog.Error("unfreeze terminate ", "addr", unfreeze.Initiator, "execaddr", execAddr, "err", err)
 		return nil, err
 	}
-	return MergeReceipt(receipt, receipt1)
+	return mergeReceipt(receipt, receipt1)
 }
 
 func (u *Unfreeze) newEntity(payload *pty.UnfreezeCreate, tx *types.Transaction) (*pty.Unfreeze, error) {
@@ -149,7 +152,7 @@ func (u *Unfreeze) create(unfreeze *pty.Unfreeze) (*types.Receipt, error) {
 		KV: []*types.KeyValue{{Key: k, Value: v}}, Logs: []*types.ReceiptLog{receiptLog}}, nil
 }
 
-func MergeReceipt(r1 *types.Receipt, r2 *types.Receipt) (*types.Receipt, error) {
+func mergeReceipt(r1 *types.Receipt, r2 *types.Receipt) (*types.Receipt, error) {
 	r1.Logs = append(r1.Logs, r2.Logs...)
 	r1.KV = append(r1.KV, r2.KV...)
 	r1.Ty = types.ExecOk

plugin/dapp/unfreeze/executor/exec_del_local.go

@@ -31,14 +31,17 @@ func (u *Unfreeze) execDelLocal(receiptData *types.ReceiptData) (*types.LocalDBS
 	return dbSet, nil
 }
 
+// ExecDelLocal_Create 本地撤销执行创建冻结合约
 func (u *Unfreeze) ExecDelLocal_Create(payload *uf.UnfreezeCreate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return u.execDelLocal(receiptData)
 }
 
+// ExecDelLocal_Withdraw 本地撤销执行冻结合约中提币
 func (u *Unfreeze) ExecDelLocal_Withdraw(payload *uf.UnfreezeWithdraw, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return u.execDelLocal(receiptData)
 }
 
+// ExecDelLocal_Terminate 本地撤销执行冻结合约的终止
 func (u *Unfreeze) ExecDelLocal_Terminate(payload *uf.UnfreezeTerminate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return u.execDelLocal(receiptData)
 }

plugin/dapp/unfreeze/executor/exec_local.go

@@ -31,14 +31,17 @@ func (u *Unfreeze) execLocal(receiptData *types.ReceiptData) (*types.LocalDBSet,
 	return dbSet, nil
 }
 
+// ExecLocal_Create 本地执行创建冻结合约
 func (u *Unfreeze) ExecLocal_Create(payload *uf.UnfreezeCreate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return u.execLocal(receiptData)
 }
 
+// ExecLocal_Withdraw 本地执行提币
 func (u *Unfreeze) ExecLocal_Withdraw(payload *uf.UnfreezeWithdraw, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return u.execLocal(receiptData)
 }
 
+// ExecLocal_Terminate 本地执行终止冻结合约
 func (u *Unfreeze) ExecLocal_Terminate(payload *uf.UnfreezeTerminate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return u.execLocal(receiptData)
 }

plugin/dapp/unfreeze/executor/exec_test.go

@@ -24,14 +24,6 @@ type execEnv struct {
 	difficulty  uint64
 }
 
-type orderArgs struct {
-	total    int64
-	startTs  int64
-	period   int64
-	duration int64
-	except   int64
-}
-
 var (
 	Symbol         = "TEST"
 	AssetExecToken = "token"

plugin/dapp/unfreeze/executor/means.go

@@ -9,6 +9,7 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
 )
 
+// Means 解冻算法接口
 type Means interface {
 	setOpt(unfreeze *pty.Unfreeze, from *pty.UnfreezeCreate) (*pty.Unfreeze, error)
 	calcFrozen(unfreeze *pty.Unfreeze, now int64) (int64, error)

plugin/dapp/unfreeze/executor/query.go

@@ -12,15 +12,17 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
 )
 
+// Query_GetUnfreezeWithdraw 查询合约可提币量
 func (u *Unfreeze) Query_GetUnfreezeWithdraw(in *types.ReqString) (types.Message, error) {
 	return QueryWithdraw(u.GetStateDB(), in.GetData())
 }
 
+// Query_GetUnfreeze 查询合约状态
 func (u *Unfreeze) Query_GetUnfreeze(in *types.ReqString) (types.Message, error) {
 	return QueryUnfreeze(u.GetStateDB(), in.GetData())
 }
 
-//查询可提币状态
+// QueryWithdraw 查询可提币状态
 func QueryWithdraw(stateDB dbm.KV, unfreezeID string) (types.Message, error) {
 	unfreeze, err := loadUnfreeze(unfreezeID, stateDB)
 	if err != nil {
@@ -51,6 +53,7 @@ func getWithdrawAvailable(unfreeze *pty.Unfreeze, calcTime int64) (int64, error)
 	return amount, nil
 }
 
+// QueryUnfreeze 查询合约状态
 func QueryUnfreeze(stateDB dbm.KV, unfreezeID string) (types.Message, error) {
 	unfreeze, err := loadUnfreeze(unfreezeID, stateDB)
 	if err != nil {

plugin/dapp/unfreeze/executor/unfreeze.go

@@ -20,10 +20,12 @@ func init() {
 	ety.InitFuncList(types.ListMethod(&Unfreeze{}))
 }
 
+// Init 重命名执行器名称
 func Init(name string, sub []byte) {
 	drivers.Register(GetName(), newUnfreeze, 0)
 }
 
+// Unfreeze 执行器结构体
 type Unfreeze struct {
 	drivers.DriverBase
 }
@@ -35,10 +37,12 @@ func newUnfreeze() drivers.Driver {
 	return t
 }
 
+// GetName 获得执行器名字
 func GetName() string {
 	return newUnfreeze().GetName()
 }
 
+// GetDriverName 获得驱动名字
 func (u *Unfreeze) GetDriverName() string {
 	return driverName
 }

plugin/dapp/unfreeze/rpc/rpc.go

@@ -12,6 +12,7 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
 )
 
+// GetUnfreeze 获得冻结合约
 func (c *channelClient) GetUnfreeze(ctx context.Context, in *types.ReqString) (*pty.Unfreeze, error) {
 	v, err := c.Query(pty.UnfreezeX, "GetUnfreeze", in)
 	if err != nil {
@@ -23,6 +24,7 @@ func (c *channelClient) GetUnfreeze(ctx context.Context, in *types.ReqString) (*
 	return nil, types.ErrDecode
 }
 
+// GetUnfreezeWithdraw 获得冻结合约可提币量
 func (c *channelClient) GetUnfreezeWithdraw(ctx context.Context, in *types.ReqString) (*pty.ReplyQueryUnfreezeWithdraw, error) {
 	v, err := c.Query(pty.UnfreezeX, "GetUnfreezeWithdraw", in)
 	if err != nil {
@@ -34,6 +36,7 @@ func (c *channelClient) GetUnfreezeWithdraw(ctx context.Context, in *types.ReqSt
 	return nil, types.ErrDecode
 }
 
+// GetUnfreeze 获得冻结合约
 func (c *Jrpc) GetUnfreeze(in *types.ReqString, result *interface{}) error {
 	v, err := c.cli.GetUnfreeze(context.Background(), in)
 	if err != nil {
@@ -44,6 +47,7 @@ func (c *Jrpc) GetUnfreeze(in *types.ReqString, result *interface{}) error {
 	return nil
 }
 
+// GetUnfreezeWithdraw 获得冻结合约可提币量
 func (c *Jrpc) GetUnfreezeWithdraw(in *types.ReqString, result *interface{}) error {
 	v, err := c.cli.GetUnfreezeWithdraw(context.Background(), in)
 	if err != nil {
@@ -54,6 +58,7 @@ func (c *Jrpc) GetUnfreezeWithdraw(in *types.ReqString, result *interface{}) err
 	return nil
 }
 
+// CreateRawUnfreezeCreate 创建冻结合约
 func (c *Jrpc) CreateRawUnfreezeCreate(param *pty.UnfreezeCreate, result *interface{}) error {
 	if param == nil {
 		return types.ErrInvalidParam
@@ -66,6 +71,7 @@ func (c *Jrpc) CreateRawUnfreezeCreate(param *pty.UnfreezeCreate, result *interf
 	return nil
 }
 
+// CreateRawUnfreezeWithdraw 创建提币交易
 func (c *Jrpc) CreateRawUnfreezeWithdraw(param *pty.UnfreezeWithdraw, result *interface{}) error {
 	if param == nil {
 		return types.ErrInvalidParam
@@ -78,6 +84,7 @@ func (c *Jrpc) CreateRawUnfreezeWithdraw(param *pty.UnfreezeWithdraw, result *in
 	return nil
 }
 
+// CreateRawUnfreezeTerminate 终止冻结合约
 func (c *Jrpc) CreateRawUnfreezeTerminate(param *pty.UnfreezeTerminate, result *interface{}) error {
 	if param == nil {
 		return types.ErrInvalidParam

plugin/dapp/unfreeze/rpc/types.go

@@ -5,16 +5,15 @@
 package rpc
 
 import (
-	log15 "github.com/33cn/chain33/common/log/log15"
 	"github.com/33cn/chain33/rpc/types"
 )
 
-var log = log15.New("module", "unfreeze.rpc")
-
+// Jrpc json rpc struct
 type Jrpc struct {
 	cli *channelClient
 }
 
+// Grpc grpc struct
 type Grpc struct {
 	*channelClient
 }
@@ -23,6 +22,7 @@ type channelClient struct {
 	types.ChannelClient
 }
 
+// Init init grpc param
 func Init(name string, s types.RPCServer) {
 	cli := &channelClient{}
 	grpc := &Grpc{channelClient: cli}

plugin/dapp/unfreeze/types/const.go

@@ -17,12 +17,16 @@ const (
 )
 
 const (
-	Action_CreateUnfreeze    = "createUnfreeze"
-	Action_WithdrawUnfreeze  = "withdrawUnfreeze"
+	// Action_CreateUnfreeze Action 名字
+	Action_CreateUnfreeze = "createUnfreeze"
+	// Action_WithdrawUnfreeze Action 名字
+	Action_WithdrawUnfreeze = "withdrawUnfreeze"
+	// Action_TerminateUnfreeze Action 名字
 	Action_TerminateUnfreeze = "terminateUnfreeze"
 )
 
 const (
+	// FuncName_QueryUnfreezeWithdraw 查询方法名
 	FuncName_QueryUnfreezeWithdraw = "QueryUnfreezeWithdraw"
 )
 
@@ -31,7 +35,7 @@ const (
 //如果发生重名，可以通过配置文件修改这些名字
 var (
 	PackageName    = "chain33.unfreeze"
-	RpcName        = "Chain33.Unfreeze"
+	RPCName        = "Chain33.Unfreeze"
 	UnfreezeX      = "unfreeze"
 	ExecerUnfreeze = []byte(UnfreezeX)
 

plugin/dapp/unfreeze/types/errors.go

@@ -7,10 +7,12 @@ package types
 import "errors"
 
 var (
-	ErrUnfreezeBeforeDue = errors.New("ErrUnfreezeBeforeDue")
-	ErrUnfreezeEmptied   = errors.New("ErrUnfreezeEmptied")
-	ErrUnfreezeMeans     = errors.New("ErrUnfreezeMeans")
-	ErrUnfreezeID        = errors.New("ErrUnfreezeID")
-	ErrNoUnfreezeItem    = errors.New("ErrNoUnfreezeItem")
-	ErrNoPrivilege       = errors.New("ErrNoPrivilege")
+	// ErrUnfreezeEmptied 没有可提币量
+	ErrUnfreezeEmptied = errors.New("ErrUnfreezeEmptied")
+	// ErrUnfreezeMeans 解冻币算法错误
+	ErrUnfreezeMeans = errors.New("ErrUnfreezeMeans")
+	// ErrUnfreezeID 冻结合约ID错误
+	ErrUnfreezeID = errors.New("ErrUnfreezeID")
+	// ErrNoPrivilege 没有权限
+	ErrNoPrivilege = errors.New("ErrNoPrivilege")
 )

plugin/dapp/unfreeze/types/types.go

@@ -31,17 +31,19 @@ func getRealExecName(paraName string) string {
 	return types.ExecName(paraName + UnfreezeX)
 }
 
+// NewType 生成新的基础类型
 func NewType() *UnfreezeType {
 	c := &UnfreezeType{}
 	c.SetChild(c)
 	return c
 }
 
-// exec
+// UnfreezeType 基础类型结构体
 type UnfreezeType struct {
 	types.ExecTypeBase
 }
 
+// GetLogMap 获得日志类型列表
 func (u *UnfreezeType) GetLogMap() map[int64]*types.LogInfo {
 	return map[int64]*types.LogInfo{
 		TyLogCreateUnfreeze:    {reflect.TypeOf(ReceiptUnfreeze{}), "LogCreateUnfreeze"},
@@ -50,10 +52,12 @@ func (u *UnfreezeType) GetLogMap() map[int64]*types.LogInfo {
 	}
 }
 
+// GetPayload 获得空的Unfreeze 的 Payload
 func (u *UnfreezeType) GetPayload() types.Message {
 	return &UnfreezeAction{}
 }
 
+// GetTypeMap 获得Action 方法列表
 func (u *UnfreezeType) GetTypeMap() map[string]int32 {
 	return map[string]int32{
 		"Create":    UnfreezeActionCreate,
@@ -62,7 +66,7 @@ func (u *UnfreezeType) GetTypeMap() map[string]int32 {
 	}
 }
 
-// TODO createTx接口暂时没法用，作为一个预留接口
+// CreateTx 创建交易
 func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.Transaction, error) {
 	tlog.Debug("UnfreezeType.CreateTx", "action", action)
 	if action == Action_CreateUnfreeze {
@@ -89,16 +93,17 @@ func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.T
 			return nil, types.ErrInvalidParam
 		}
 		return u.RPC_UnfreezeTerminateTx(&param)
-	} else {
-		return nil, types.ErrNotSupport
 	}
-	return nil, nil
+
+	return nil, types.ErrNotSupport
 }
 
+// RPC_UnfreezeCreateTx 创建冻结合约交易入口
 func (u UnfreezeType) RPC_UnfreezeCreateTx(parm *UnfreezeCreate) (*types.Transaction, error) {
 	return CreateUnfreezeCreateTx(types.GetParaName(), parm)
 }
 
+// CreateUnfreezeCreateTx 创建冻结合约交易
 func CreateUnfreezeCreateTx(title string, parm *UnfreezeCreate) (*types.Transaction, error) {
 	if parm == nil {
 		tlog.Error("RPC_UnfreezeCreateTx", "parm", parm)
@@ -126,10 +131,12 @@ func CreateUnfreezeCreateTx(title string, parm *UnfreezeCreate) (*types.Transact
 	return tx, nil
 }
 
+// RPC_UnfreezeWithdrawTx 创建提币交易入口
 func (u UnfreezeType) RPC_UnfreezeWithdrawTx(parm *UnfreezeWithdraw) (*types.Transaction, error) {
 	return CreateUnfreezeWithdrawTx(types.GetParaName(), parm)
 }
 
+// CreateUnfreezeWithdrawTx 创建提币交易
 func CreateUnfreezeWithdrawTx(title string, parm *UnfreezeWithdraw) (*types.Transaction, error) {
 	if parm == nil {
 		tlog.Error("RPC_UnfreezeWithdrawTx", "parm", parm)
@@ -152,10 +159,12 @@ func CreateUnfreezeWithdrawTx(title string, parm *UnfreezeWithdraw) (*types.Tran
 	return tx, nil
 }
 
+// RPC_UnfreezeTerminateTx 创建终止冻结合约入口
 func (u UnfreezeType) RPC_UnfreezeTerminateTx(parm *UnfreezeTerminate) (*types.Transaction, error) {
 	return CreateUnfreezeTerminateTx(types.GetParaName(), parm)
 }
 
+// CreateUnfreezeTerminateTx 创建终止冻结合约
 func CreateUnfreezeTerminateTx(title string, parm *UnfreezeTerminate) (*types.Transaction, error) {
 	if parm == nil {
 		tlog.Error("RPC_UnfreezeTerminateTx", "parm", parm)