Merge pull request #35 from jixingwei/fix_lot_lint

plugin/dapp/lottery/executor/exec.go

@@ -9,21 +9,25 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/lottery/types"
 )
 
+// Exec_Create Action
 func (l *Lottery) Exec_Create(payload *pty.LotteryCreate, tx *types.Transaction, index int) (*types.Receipt, error) {
 	actiondb := NewLotteryAction(l, tx, index)
 	return actiondb.LotteryCreate(payload)
 }
 
+// Exec_Buy Action
 func (l *Lottery) Exec_Buy(payload *pty.LotteryBuy, tx *types.Transaction, index int) (*types.Receipt, error) {
 	actiondb := NewLotteryAction(l, tx, index)
 	return actiondb.LotteryBuy(payload)
 }
 
+// Exec_Draw Action
 func (l *Lottery) Exec_Draw(payload *pty.LotteryDraw, tx *types.Transaction, index int) (*types.Receipt, error) {
 	actiondb := NewLotteryAction(l, tx, index)
 	return actiondb.LotteryDraw(payload)
 }
 
+// Exec_Close Action
 func (l *Lottery) Exec_Close(payload *pty.LotteryClose, tx *types.Transaction, index int) (*types.Receipt, error) {
 	actiondb := NewLotteryAction(l, tx, index)
 	return actiondb.LotteryClose(payload)

plugin/dapp/lottery/executor/exec_del_local.go

@@ -41,18 +41,22 @@ func (l *Lottery) execDelLocal(tx *types.Transaction, receiptData *types.Receipt
 
 }
 
+// ExecDelLocal_Create Action
 func (l *Lottery) ExecDelLocal_Create(payload *pty.LotteryCreate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return nil, nil
 }
 
+// ExecDelLocal_Buy Action
 func (l *Lottery) ExecDelLocal_Buy(payload *pty.LotteryBuy, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return nil, nil
 }
 
+// ExecDelLocal_Draw Action
 func (l *Lottery) ExecDelLocal_Draw(payload *pty.LotteryDraw, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return nil, nil
 }
 
+// ExecDelLocal_Close Action
 func (l *Lottery) ExecDelLocal_Close(payload *pty.LotteryClose, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return nil, nil
 }

plugin/dapp/lottery/executor/exec_local.go

@@ -40,18 +40,22 @@ func (l *Lottery) execLocal(tx *types.Transaction, receipt *types.ReceiptData) (
 	return set, nil
 }
 
+// ExecLocal_Create Action
 func (l *Lottery) ExecLocal_Create(payload *pty.LotteryCreate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return l.execLocal(tx, receiptData)
 }
 
+// ExecLocal_Buy Action
 func (l *Lottery) ExecLocal_Buy(payload *pty.LotteryBuy, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return l.execLocal(tx, receiptData)
 }
 
+// ExecLocal_Draw Action
 func (l *Lottery) ExecLocal_Draw(payload *pty.LotteryDraw, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return l.execLocal(tx, receiptData)
 }
 
+// ExecLocal_Close Action
 func (l *Lottery) ExecLocal_Close(payload *pty.LotteryClose, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	return l.execLocal(tx, receiptData)
 }

plugin/dapp/lottery/executor/keys.go

@@ -6,32 +6,32 @@ package executor
 
 import "fmt"
 
-func calcLotteryBuyPrefix(lotteryId string, addr string) []byte {
-	key := fmt.Sprintf("LODB-lottery-buy:%s:%s", lotteryId, addr)
+func calcLotteryBuyPrefix(lotteryID string, addr string) []byte {
+	key := fmt.Sprintf("LODB-lottery-buy:%s:%s", lotteryID, addr)
 	return []byte(key)
 }
 
-func calcLotteryBuyRoundPrefix(lotteryId string, addr string, round int64) []byte {
-	key := fmt.Sprintf("LODB-lottery-buy:%s:%s:%10d", lotteryId, addr, round)
+func calcLotteryBuyRoundPrefix(lotteryID string, addr string, round int64) []byte {
+	key := fmt.Sprintf("LODB-lottery-buy:%s:%s:%10d", lotteryID, addr, round)
 	return []byte(key)
 }
 
-func calcLotteryBuyKey(lotteryId string, addr string, round int64, index int64) []byte {
-	key := fmt.Sprintf("LODB-lottery-buy:%s:%s:%10d:%18d", lotteryId, addr, round, index)
+func calcLotteryBuyKey(lotteryID string, addr string, round int64, index int64) []byte {
+	key := fmt.Sprintf("LODB-lottery-buy:%s:%s:%10d:%18d", lotteryID, addr, round, index)
 	return []byte(key)
 }
 
-func calcLotteryDrawPrefix(lotteryId string) []byte {
-	key := fmt.Sprintf("LODB-lottery-draw:%s", lotteryId)
+func calcLotteryDrawPrefix(lotteryID string) []byte {
+	key := fmt.Sprintf("LODB-lottery-draw:%s", lotteryID)
 	return []byte(key)
 }
 
-func calcLotteryDrawKey(lotteryId string, round int64) []byte {
-	key := fmt.Sprintf("LODB-lottery-draw:%s:%10d", lotteryId, round)
+func calcLotteryDrawKey(lotteryID string, round int64) []byte {
+	key := fmt.Sprintf("LODB-lottery-draw:%s:%10d", lotteryID, round)
 	return []byte(key)
 }
 
-func calcLotteryKey(lotteryId string, status int32) []byte {
-	key := fmt.Sprintf("LODB-lottery-:%d:%s", status, lotteryId)
+func calcLotteryKey(lotteryID string, status int32) []byte {
+	key := fmt.Sprintf("LODB-lottery-:%d:%s", status, lotteryID)
 	return []byte(key)
 }

plugin/dapp/lottery/executor/lottery.go

@@ -27,6 +27,7 @@ type subConfig struct {
 
 var cfg subConfig
 
+// Init lottery
 func Init(name string, sub []byte) {
 	driverName := GetName()
 	if name != driverName {
@@ -38,10 +39,12 @@ func Init(name string, sub []byte) {
 	drivers.Register(driverName, newLottery, types.GetDappFork(driverName, "Enable"))
 }
 
+// GetName for lottery
 func GetName() string {
 	return newLottery().GetName()
 }
 
+// Lottery driver
 type Lottery struct {
 	drivers.DriverBase
 }
@@ -53,7 +56,8 @@ func newLottery() drivers.Driver {
 	return l
 }
 
-func (l *Lottery) GetDriverName() string {
+// GetDriverName for lottery
+func (lott *Lottery) GetDriverName() string {
 	return pty.LotteryX
 }
 
@@ -120,9 +124,8 @@ func (lott *Lottery) findLotteryDrawRecord(key []byte) (*pty.LotteryDrawRecord,
 
 func (lott *Lottery) saveLotteryBuy(lotterylog *pty.ReceiptLottery) (kvs []*types.KeyValue) {
 	key := calcLotteryBuyKey(lotterylog.LotteryId, lotterylog.Addr, lotterylog.Round, lotterylog.Index)
-	kv := &types.KeyValue{}
-	record := &pty.LotteryBuyRecord{lotterylog.Number, lotterylog.Amount, lotterylog.Round, 0, lotterylog.Way, lotterylog.Index, lotterylog.Time, lotterylog.TxHash}
-	kv = &types.KeyValue{key, types.Encode(record)}
+	record := &pty.LotteryBuyRecord{Number: lotterylog.Number, Amount: lotterylog.Amount, Round: lotterylog.Round, Type: 0, Way: lotterylog.Way, Index: lotterylog.Index, Time: lotterylog.Time, TxHash: lotterylog.TxHash}
+	kv := &types.KeyValue{Key: key, Value: types.Encode(record)}
 
 	kvs = append(kvs, kv)
 	return kvs
@@ -131,7 +134,7 @@ func (lott *Lottery) saveLotteryBuy(lotterylog *pty.ReceiptLottery) (kvs []*type
 func (lott *Lottery) deleteLotteryBuy(lotterylog *pty.ReceiptLottery) (kvs []*types.KeyValue) {
 	key := calcLotteryBuyKey(lotterylog.LotteryId, lotterylog.Addr, lotterylog.Round, lotterylog.Index)
 
-	kv := &types.KeyValue{key, nil}
+	kv := &types.KeyValue{Key: key, Value: nil}
 	kvs = append(kvs, kv)
 	return kvs
 }
@@ -158,7 +161,6 @@ func (lott *Lottery) updateLotteryBuy(lotterylog *pty.ReceiptLottery, isAdd bool
 				if err != nil || record == nil {
 					return kvs
 				}
-				kv := &types.KeyValue{}
 
 				if isAdd {
 					llog.Debug("updateLotteryBuy update key")
@@ -167,7 +169,7 @@ func (lott *Lottery) updateLotteryBuy(lotterylog *pty.ReceiptLottery, isAdd bool
 					record.Type = 0
 				}
 
-				kv = &types.KeyValue{key, types.Encode(record)}
+				kv := &types.KeyValue{Key: key, Value: types.Encode(record)}
 				kvs = append(kvs, kv)
 			}
 		}
@@ -178,16 +180,15 @@ func (lott *Lottery) updateLotteryBuy(lotterylog *pty.ReceiptLottery, isAdd bool
 
 func (lott *Lottery) saveLotteryDraw(lotterylog *pty.ReceiptLottery) (kvs []*types.KeyValue) {
 	key := calcLotteryDrawKey(lotterylog.LotteryId, lotterylog.Round)
-	kv := &types.KeyValue{}
-	record := &pty.LotteryDrawRecord{lotterylog.LuckyNumber, lotterylog.Round, lotterylog.Time, lotterylog.TxHash}
-	kv = &types.KeyValue{key, types.Encode(record)}
+	record := &pty.LotteryDrawRecord{Number: lotterylog.LuckyNumber, Round: lotterylog.Round, Time: lotterylog.Time, TxHash: lotterylog.TxHash}
+	kv := &types.KeyValue{Key: key, Value: types.Encode(record)}
 	kvs = append(kvs, kv)
 	return kvs
 }
 
 func (lott *Lottery) deleteLotteryDraw(lotterylog *pty.ReceiptLottery) (kvs []*types.KeyValue) {
 	key := calcLotteryDrawKey(lotterylog.LotteryId, lotterylog.Round)
-	kv := &types.KeyValue{key, nil}
+	kv := &types.KeyValue{Key: key, Value: nil}
 	kvs = append(kvs, kv)
 	return kvs
 }
@@ -210,20 +211,21 @@ func (lott *Lottery) deleteLottery(lotterylog *pty.ReceiptLottery) (kvs []*types
 	return kvs
 }
 
-func addlottery(lotteryId string, status int32) *types.KeyValue {
+func addlottery(lotteryID string, status int32) *types.KeyValue {
 	kv := &types.KeyValue{}
-	kv.Key = calcLotteryKey(lotteryId, status)
-	kv.Value = []byte(lotteryId)
+	kv.Key = calcLotteryKey(lotteryID, status)
+	kv.Value = []byte(lotteryID)
 	return kv
 }
 
-func dellottery(lotteryId string, status int32) *types.KeyValue {
+func dellottery(lotteryID string, status int32) *types.KeyValue {
 	kv := &types.KeyValue{}
-	kv.Key = calcLotteryKey(lotteryId, status)
+	kv.Key = calcLotteryKey(lotteryID, status)
 	kv.Value = nil
 	return kv
 }
 
+// GetPayloadValue lotteryAction
 func (lott *Lottery) GetPayloadValue() types.Message {
 	return &pty.LotteryAction{}
 }

plugin/dapp/lottery/executor/lotteryblock.go

@@ -20,7 +20,7 @@ func (action *Action) getTxActions(height int64, blockNum int64) ([]*tickettypes
 	var txActions []*tickettypes.TicketAction
 	llog.Error("getTxActions", "height", height, "blockNum", blockNum)
 	if !types.IsPara() {
-		req := &types.ReqBlocks{height - blockNum + 1, height, false, []string{""}}
+		req := &types.ReqBlocks{Start: height - blockNum + 1, End: height, IsDetail: false, Pid: []string{""}}
 
 		blockDetails, err := action.api.GetBlocks(req)
 		if err != nil {
@@ -36,7 +36,8 @@ func (action *Action) getTxActions(height int64, blockNum int64) ([]*tickettypes
 			txActions = append(txActions, ticketAction)
 		}
 		return txActions, nil
-	} else {
+	}
+
 	//block height on main
 	mainHeight := action.GetMainHeightByTxHash(action.txhash)
 	if mainHeight < 0 {
@@ -58,13 +59,13 @@ func (action *Action) getTxActions(height int64, blockNum int64) ([]*tickettypes
 		txActions = append(txActions, ticketAction)
 	}
 	return txActions, nil
-	}
+
 }
 
-//TransactionDetail
+// GetMainHeightByTxHash get Block height
 func (action *Action) GetMainHeightByTxHash(txHash []byte) int64 {
 	for i := 0; i < retryNum; i++ {
-		req := &types.ReqHash{txHash}
+		req := &types.ReqHash{Hash: txHash}
 		txDetail, err := action.grpcClient.QueryTransaction(context.Background(), req)
 		if err != nil {
 			time.Sleep(time.Second)
@@ -76,8 +77,9 @@ func (action *Action) GetMainHeightByTxHash(txHash []byte) int64 {
 	return -1
 }
 
+// GetBlocksOnMain get Block from main chain
 func (action *Action) GetBlocksOnMain(start int64, end int64) (*types.BlockDetails, error) {
-	req := &types.ReqBlocks{start, end, false, []string{""}}
+	req := &types.ReqBlocks{Start: start, End: end, IsDetail: false, Pid: []string{""}}
 	getBlockSucc := false
 	var reply *types.Reply
 	var err error

plugin/dapp/lottery/executor/lotterydb.go

@@ -35,6 +35,7 @@ const (
 	creatorKey = "lottery-creator"
 )
 
+// List control
 const (
 	ListDESC    = int32(0)
 	ListASC     = int32(1)
@@ -42,6 +43,7 @@ const (
 	MaxCount    = int32(100) //最多取100条
 )
 
+// Star level
 const (
 	FiveStar  = 5
 	ThreeStar = 3
@@ -56,14 +58,16 @@ const randMolNum = 5
 const grpcRecSize int = 5 * 30 * 1024 * 1024
 const blockNum = 5
 
+// LotteryDB struct
 type LotteryDB struct {
 	pty.Lottery
 }
 
-func NewLotteryDB(lotteryId string, purBlock int64, drawBlock int64,
+// NewLotteryDB New management instance
+func NewLotteryDB(lotteryID string, purBlock int64, drawBlock int64,
 	blockHeight int64, addr string) *LotteryDB {
 	lott := &LotteryDB{}
-	lott.LotteryId = lotteryId
+	lott.LotteryId = lotteryID
 	lott.PurBlockNum = purBlock
 	lott.DrawBlockNum = drawBlock
 	lott.CreateHeight = blockHeight
@@ -75,17 +79,19 @@ func NewLotteryDB(lotteryId string, purBlock int64, drawBlock int64,
 	lott.MissingRecords = make([]*pty.MissingRecord, 5)
 	for index := range lott.MissingRecords {
 		tempTimes := make([]int32, 10)
-		lott.MissingRecords[index] = &pty.MissingRecord{tempTimes}
+		lott.MissingRecords[index] = &pty.MissingRecord{Times: tempTimes}
 	}
 	return lott
 }
 
+// GetKVSet for LotteryDB
 func (lott *LotteryDB) GetKVSet() (kvset []*types.KeyValue) {
 	value := types.Encode(&lott.Lottery)
-	kvset = append(kvset, &types.KeyValue{Key(lott.LotteryId), value})
+	kvset = append(kvset, &types.KeyValue{Key: Key(lott.LotteryId), Value: value})
 	return kvset
 }
 
+// Save for LotteryDB
 func (lott *LotteryDB) Save(db dbm.KV) {
 	set := lott.GetKVSet()
 	for i := 0; i < len(set); i++ {
@@ -93,12 +99,14 @@ func (lott *LotteryDB) Save(db dbm.KV) {
 	}
 }
 
+// Key for lottery
 func Key(id string) (key []byte) {
 	key = append(key, []byte("mavl-"+pty.LotteryX+"-")...)
 	key = append(key, []byte(id)...)
 	return key
 }
 
+// Action struct
 type Action struct {
 	coinsAccount *account.DB
 	db           dbm.KV
@@ -114,6 +122,7 @@ type Action struct {
 	index        int
 }
 
+// NewLotteryAction generate New Action
 func NewLotteryAction(l *Lottery, tx *types.Transaction, index int) *Action {
 	hash := tx.Hash()
 	fromaddr := tx.From()
@@ -130,6 +139,7 @@ func NewLotteryAction(l *Lottery, tx *types.Transaction, index int) *Action {
 		l.GetHeight(), dapp.ExecAddress(string(tx.Execer)), l.GetDifficulty(), l.GetApi(), conn, grpcClient, index}
 }
 
+// GetReceiptLog generate logs for all lottery action
 func (action *Action) GetReceiptLog(lottery *pty.Lottery, preStatus int32, logTy int32,
 	round int64, buyNumber int64, amount int64, way int64, luckyNum int64, updateInfo *pty.LotteryUpdateBuyInfo) *types.ReceiptLog {
 	log := &types.ReceiptLog{}
@@ -164,17 +174,19 @@ func (action *Action) GetReceiptLog(lottery *pty.Lottery, preStatus int32, logTy
 	return log
 }
 
-//fmt.Sprintf("%018d", action.height*types.MaxTxsPerBlock+int64(action.index))
+// GetIndex returns index in block
 func (action *Action) GetIndex() int64 {
 	return action.height*types.MaxTxsPerBlock + int64(action.index)
 }
 
+// LotteryCreate Action
+// creator should be valid
 func (action *Action) LotteryCreate(create *pty.LotteryCreate) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 	var receipt *types.Receipt
 
-	lotteryId := common.ToHex(action.txhash)
+	lotteryID := common.ToHex(action.txhash)
 
 	if !isRightCreator(action.fromaddr, action.db, false) {
 		return nil, pty.ErrNoPrivilege
@@ -192,13 +204,13 @@ func (action *Action) LotteryCreate(create *pty.LotteryCreate) (*types.Receipt,
 		return nil, pty.ErrLotteryDrawBlockLimit
 	}
 
-	_, err := findLottery(action.db, lotteryId)
+	_, err := findLottery(action.db, lotteryID)
 	if err != types.ErrNotFound {
-		llog.Error("LotteryCreate", "LotteryCreate repeated", lotteryId)
+		llog.Error("LotteryCreate", "LotteryCreate repeated", lotteryID)
 		return nil, pty.ErrLotteryRepeatHash
 	}
 
-	lott := NewLotteryDB(lotteryId, create.GetPurBlockNum(),
+	lott := NewLotteryDB(lotteryID, create.GetPurBlockNum(),
 		create.GetDrawBlockNum(), action.height, action.fromaddr)
 
 	if types.IsPara() {
@@ -210,7 +222,7 @@ func (action *Action) LotteryCreate(create *pty.LotteryCreate) (*types.Receipt,
 		lott.CreateOnMain = mainHeight
 	}
 
-	llog.Debug("LotteryCreate created", "lotteryId", lotteryId)
+	llog.Debug("LotteryCreate created", "lotteryID", lotteryID)
 
 	lott.Save(action.db)
 	kv = append(kv, lott.GetKVSet()...)
@@ -218,11 +230,12 @@ func (action *Action) LotteryCreate(create *pty.LotteryCreate) (*types.Receipt,
 	receiptLog := action.GetReceiptLog(&lott.Lottery, 0, pty.TyLogLotteryCreate, 0, 0, 0, 0, 0, nil)
 	logs = append(logs, receiptLog)
 
-	receipt = &types.Receipt{types.ExecOk, kv, logs}
+	receipt = &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
 
-//one bty for one ticket
+// LotteryBuy Action
+// One coin for one ticket
 func (action *Action) LotteryBuy(buy *pty.LotteryBuy) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
@@ -254,7 +267,7 @@ func (action *Action) LotteryBuy(buy *pty.LotteryBuy) (*types.Receipt, error) {
 		llog.Debug("LotteryBuy switch to purchasestate")
 		lott.LastTransToPurState = action.height
 		lott.Status = pty.LotteryPurchase
-		lott.Round += 1
+		lott.Round++
 		if types.IsPara() {
 			mainHeight := action.GetMainHeightByTxHash(action.txhash)
 			if mainHeight < 0 {
@@ -303,7 +316,7 @@ func (action *Action) LotteryBuy(buy *pty.LotteryBuy) (*types.Receipt, error) {
 		lott.Records = make(map[string]*pty.PurchaseRecords)
 	}
 
-	newRecord := &pty.PurchaseRecord{buy.GetAmount(), buy.GetNumber(), action.GetIndex(), buy.GetWay()}
+	newRecord := &pty.PurchaseRecord{Amount: buy.GetAmount(), Number: buy.GetNumber(), Index: action.GetIndex(), Way: buy.GetWay()}
 	llog.Debug("LotteryBuy", "amount", buy.GetAmount(), "number", buy.GetNumber())
 
 	/**********
@@ -347,12 +360,13 @@ func (action *Action) LotteryBuy(buy *pty.LotteryBuy) (*types.Receipt, error) {
 	receiptLog := action.GetReceiptLog(&lott.Lottery, preStatus, pty.TyLogLotteryBuy, lott.Round, buy.GetNumber(), buy.GetAmount(), buy.GetWay(), 0, nil)
 	logs = append(logs, receiptLog)
 
-	receipt = &types.Receipt{types.ExecOk, kv, logs}
+	receipt = &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
 
-//1.Anyone who buy a ticket
-//2.Creator
+// LotteryDraw Action
+// 1.Anyone who buy a ticket
+// 2.Creator
 func (action *Action) LotteryDraw(draw *pty.LotteryDraw) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
@@ -410,10 +424,11 @@ func (action *Action) LotteryDraw(draw *pty.LotteryDraw) (*types.Receipt, error)
 	receiptLog := action.GetReceiptLog(&lott.Lottery, preStatus, pty.TyLogLotteryDraw, lott.Round, 0, 0, 0, lott.LuckyNumber, updateInfo)
 	logs = append(logs, receiptLog)
 
-	receipt = &types.Receipt{types.ExecOk, kv, logs}
+	receipt = &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
 
+// LotteryClose Action
 func (action *Action) LotteryClose(draw *pty.LotteryClose) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
@@ -442,7 +457,7 @@ func (action *Action) LotteryClose(draw *pty.LotteryClose) (*types.Receipt, erro
 
 	addrkeys := make([]string, len(lott.Records))
 	i := 0
-	var totalReturn int64 = 0
+	var totalReturn int64
 	for addr := range lott.Records {
 		totalReturn += lott.Records[addr].AmountOneRound
 		addrkeys[i] = addr
@@ -487,17 +502,18 @@ func (action *Action) LotteryClose(draw *pty.LotteryClose) (*types.Receipt, erro
 	receiptLog := action.GetReceiptLog(&lott.Lottery, preStatus, pty.TyLogLotteryClose, 0, 0, 0, 0, 0, nil)
 	logs = append(logs, receiptLog)
 
-	return &types.Receipt{types.ExecOk, kv, logs}, nil
+	return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, nil
 }
 
-func (action *Action) GetModify(beg, end int64, randMolNum int64) ([]byte, error) {
+// GetCalculableHash return hash for calculation
+func (action *Action) GetCalculableHash(beg, end int64, randMolNum int64) ([]byte, error) {
 	//通过某个区间计算modify
 	timeSource := int64(0)
 	total := int64(0)
 	//last := []byte("last")
 	newmodify := ""
 	for i := beg; i < end; i += randMolNum {
-		req := &types.ReqBlocks{i, i, false, []string{""}}
+		req := &types.ReqBlocks{Start: i, End: i, IsDetail: false, Pid: []string{""}}
 		blocks, err := action.api.GetBlocks(req)
 		if err != nil {
 			return []byte{}, err
@@ -534,14 +550,14 @@ func (action *Action) GetModify(beg, end int64, randMolNum int64) ([]byte, error
 
 //random used for verfication in solo
 func (action *Action) findLuckyNum(isSolo bool, lott *LotteryDB) int64 {
-	var num int64 = 0
+	var num int64
 	if isSolo {
 		//used for internal verfication
 		num = 12345
 	} else {
 		randMolNum := (lott.TotalPurchasedTxNum+action.height-lott.LastTransToPurState)%3 + 2 //3~5
 
-		modify, err := action.GetModify(lott.LastTransToPurState, action.height-1, randMolNum)
+		modify, err := action.GetCalculableHash(lott.LastTransToPurState, action.height-1, randMolNum)
 		llog.Error("findLuckyNum", "begin", lott.LastTransToPurState, "end", action.height-1, "randMolNum", randMolNum)
 
 		if err != nil {
@@ -591,8 +607,8 @@ func (action *Action) checkDraw(lott *LotteryDB) (*types.Receipt, *pty.LotteryUp
 	//calculate fund for all participant showed their number
 	var updateInfo pty.LotteryUpdateBuyInfo
 	updateInfo.BuyInfo = make(map[string]*pty.LotteryUpdateRecs)
-	var tempFund int64 = 0
-	var totalFund int64 = 0
+	var tempFund int64
+	var totalFund int64
 	addrkeys := make([]string, len(lott.Records))
 	i := 0
 	for addr := range lott.Records {
@@ -601,7 +617,7 @@ func (action *Action) checkDraw(lott *LotteryDB) (*types.Receipt, *pty.LotteryUp
 		for _, rec := range lott.Records[addr].Record {
 			fund, fundType := checkFundAmount(luckynum, rec.Number, rec.Way)
 			if fund != 0 {
-				newUpdateRec := &pty.LotteryUpdateRec{rec.Index, fundType}
+				newUpdateRec := &pty.LotteryUpdateRec{Index: rec.Index, Type: fundType}
 				if update, ok := updateInfo.BuyInfo[addr]; ok {
 					update.Records = append(update.Records, newUpdateRec)
 				} else {
@@ -617,7 +633,7 @@ func (action *Action) checkDraw(lott *LotteryDB) (*types.Receipt, *pty.LotteryUp
 	}
 	llog.Debug("checkDraw", "lenofupdate", len(updateInfo.BuyInfo))
 	llog.Debug("checkDraw", "update", updateInfo.BuyInfo)
-	var factor float64 = 0
+	var factor float64
 	if totalFund > lott.GetFund()/2 {
 		llog.Debug("checkDraw ajust fund", "lott.Fund", lott.Fund, "totalFund", totalFund)
 		factor = (float64)(lott.GetFund()) / 2 / (float64)(totalFund)
@@ -677,7 +693,7 @@ func (action *Action) checkDraw(lott *LotteryDB) (*types.Receipt, *pty.LotteryUp
 		lott.LastTransToDrawStateOnMain = mainHeight
 	}
 
-	return &types.Receipt{types.ExecOk, kv, logs}, &updateInfo, nil
+	return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, &updateInfo, nil
 }
 func (action *Action) recordMissing(lott *LotteryDB) {
 	temp := int32(lott.LuckyNumber)
@@ -692,7 +708,7 @@ func (action *Action) recordMissing(lott *LotteryDB) {
 	for i := 0; i < 5; i++ {
 		for j := 0; j < 10; j++ {
 			if eachNum[i] != sample[j] {
-				lott.MissingRecords[i].Times[j] += 1
+				lott.MissingRecords[i].Times[j]++
 			}
 		}
 	}
@@ -710,7 +726,7 @@ func getManageKey(key string, db dbm.KV) ([]byte, error) {
 func isRightCreator(addr string, db dbm.KV, isSolo bool) bool {
 	if isSolo {
 		return true
-	} else {
+	}
 	value, err := getManageKey(creatorKey, db)
 	if err != nil {
 		llog.Error("LotteryCreate", "creatorKey", creatorKey)
@@ -734,15 +750,15 @@ func isRightCreator(addr string, db dbm.KV, isSolo bool) bool {
 		}
 	}
 	return false
-	}
+
 }
 
 func isEableToClose() bool {
 	return true
 }
 
-func findLottery(db dbm.KV, lotteryId string) (*pty.Lottery, error) {
-	data, err := db.Get(Key(lotteryId))
+func findLottery(db dbm.KV, lotteryID string) (*pty.Lottery, error) {
+	data, err := db.Get(Key(lotteryID))
 	if err != nil {
 		llog.Debug("findLottery", "get", err)
 		return nil, err
@@ -757,6 +773,7 @@ func findLottery(db dbm.KV, lotteryId string) (*pty.Lottery, error) {
 	return &lott, nil
 }
 
+// CheckExecAccount check the account avoiding rollback
 func (action *Action) CheckExecAccount(addr string, amount int64, isFrozen bool) bool {
 	acc := action.coinsAccount.LoadExecAccount(addr, action.execaddr)
 	if isFrozen {
@@ -772,6 +789,7 @@ func (action *Action) CheckExecAccount(addr string, amount int64, isFrozen bool)
 	return false
 }
 
+// ListLotteryLuckyHistory returns all the luckynum in history
 func ListLotteryLuckyHistory(db dbm.Lister, stateDB dbm.KV, param *pty.ReqLotteryLuckyHistory) (types.Message, error) {
 	direction := ListDESC
 	if param.GetDirection() == ListASC {
@@ -811,6 +829,7 @@ func ListLotteryLuckyHistory(db dbm.Lister, stateDB dbm.KV, param *pty.ReqLotter
 	return &records, nil
 }
 
+// ListLotteryBuyRecords for addr
 func ListLotteryBuyRecords(db dbm.Lister, stateDB dbm.KV, param *pty.ReqLotteryBuyHistory) (types.Message, error) {
 	direction := ListDESC
 	if param.GetDirection() == ListASC {

plugin/dapp/lottery/executor/query.go

@@ -9,17 +9,19 @@ import (
 	pty "github.com/33cn/plugin/plugin/dapp/lottery/types"
 )
 
+// Query_GetLotteryNormalInfo not changed info
 func (l *Lottery) Query_GetLotteryNormalInfo(param *pty.ReqLotteryInfo) (types.Message, error) {
 	lottery, err := findLottery(l.GetStateDB(), param.GetLotteryId())
 	if err != nil {
 		return nil, err
 	}
-	return &pty.ReplyLotteryNormalInfo{lottery.CreateHeight,
-		lottery.PurBlockNum,
-		lottery.DrawBlockNum,
-		lottery.CreateAddr}, nil
+	return &pty.ReplyLotteryNormalInfo{CreateHeight: lottery.CreateHeight,
+		PurBlockNum:  lottery.PurBlockNum,
+		DrawBlockNum: lottery.DrawBlockNum,
+		CreateAddr:   lottery.CreateAddr}, nil
 }
 
+// Query_GetLotteryPurchaseAddr for current round
 func (l *Lottery) Query_GetLotteryPurchaseAddr(param *pty.ReqLotteryInfo) (types.Message, error) {
 	lottery, err := findLottery(l.GetStateDB(), param.GetLotteryId())
 	if err != nil {
@@ -33,6 +35,7 @@ func (l *Lottery) Query_GetLotteryPurchaseAddr(param *pty.ReqLotteryInfo) (types
 	return reply, nil
 }
 
+// Query_GetLotteryCurrentInfo state
 func (l *Lottery) Query_GetLotteryCurrentInfo(param *pty.ReqLotteryInfo) (types.Message, error) {
 	lottery, err := findLottery(l.GetStateDB(), param.GetLotteryId())
 	if err != nil {
@@ -54,10 +57,12 @@ func (l *Lottery) Query_GetLotteryCurrentInfo(param *pty.ReqLotteryInfo) (types.
 	return reply, nil
 }
 
+// Query_GetLotteryHistoryLuckyNumber for all history
 func (l *Lottery) Query_GetLotteryHistoryLuckyNumber(param *pty.ReqLotteryLuckyHistory) (types.Message, error) {
 	return ListLotteryLuckyHistory(l.GetLocalDB(), l.GetStateDB(), param)
 }
 
+// Query_GetLotteryRoundLuckyNumber for each round
 func (l *Lottery) Query_GetLotteryRoundLuckyNumber(param *pty.ReqLotteryLuckyInfo) (types.Message, error) {
 	//	var req pty.ReqLotteryLuckyInfo
 	var records []*pty.LotteryDrawRecord
@@ -77,10 +82,12 @@ func (l *Lottery) Query_GetLotteryRoundLuckyNumber(param *pty.ReqLotteryLuckyInf
 	return &pty.LotteryDrawRecords{Records: records}, nil
 }
 
+// Query_GetLotteryHistoryBuyInfo for all history
 func (l *Lottery) Query_GetLotteryHistoryBuyInfo(param *pty.ReqLotteryBuyHistory) (types.Message, error) {
 	return ListLotteryBuyRecords(l.GetLocalDB(), l.GetStateDB(), param)
 }
 
+// Query_GetLotteryBuyRoundInfo for each round
 func (l *Lottery) Query_GetLotteryBuyRoundInfo(param *pty.ReqLotteryBuyInfo) (types.Message, error) {
 	key := calcLotteryBuyRoundPrefix(param.LotteryId, param.Addr, param.Round)
 	record, err := l.findLotteryBuyRecords(key)

plugin/dapp/lottery/types/errors.go

@@ -6,6 +6,7 @@ package types
 
 import "errors"
 
+// Errors for lottery
 var (
 	ErrNoPrivilege              = errors.New("ErrNoPrivilege")
 	ErrLotteryStatus            = errors.New("ErrLotteryStatus")

plugin/dapp/lottery/types/lottery.go

@@ -23,17 +23,20 @@ func init() {
 	types.RegisterDappFork(LotteryX, "Enable", 0)
 }
 
+// LotteryType def
 type LotteryType struct {
 	types.ExecTypeBase
 }
 
+// NewType method
 func NewType() *LotteryType {
 	c := &LotteryType{}
 	c.SetChild(c)
 	return c
 }
 
-func (at *LotteryType) GetLogMap() map[int64]*types.LogInfo {
+// GetLogMap method
+func (lottery *LotteryType) GetLogMap() map[int64]*types.LogInfo {
 	return map[int64]*types.LogInfo{
 		TyLogLotteryCreate: {reflect.TypeOf(ReceiptLottery{}), "LogLotteryCreate"},
 		TyLogLotteryBuy:    {reflect.TypeOf(ReceiptLottery{}), "LogLotteryBuy"},
@@ -42,13 +45,15 @@ func (at *LotteryType) GetLogMap() map[int64]*types.LogInfo {
 	}
 }
 
-func (at *LotteryType) GetPayload() types.Message {
+// GetPayload method
+func (lottery *LotteryType) GetPayload() types.Message {
 	return &LotteryAction{}
 }
 
+// CreateTx method
 func (lottery LotteryType) CreateTx(action string, message json.RawMessage) (*types.Transaction, error) {
 	llog.Debug("lottery.CreateTx", "action", action)
-	var tx *types.Transaction
+
 	if action == "LotteryCreate" {
 		var param LotteryCreateTx
 		err := json.Unmarshal(message, &param)
@@ -84,11 +89,10 @@ func (lottery LotteryType) CreateTx(action string, message json.RawMessage) (*ty
 	} else {
 		return nil, types.ErrNotSupport
 	}
-
-	return tx, nil
 }
 
-func (lott LotteryType) GetTypeMap() map[string]int32 {
+// GetTypeMap method
+func (lottery LotteryType) GetTypeMap() map[string]int32 {
 	return map[string]int32{
 		"Create": LotteryActionCreate,
 		"Buy":    LotteryActionBuy,
@@ -97,6 +101,7 @@ func (lott LotteryType) GetTypeMap() map[string]int32 {
 	}
 }
 
+// CreateRawLotteryCreateTx method
 func CreateRawLotteryCreateTx(parm *LotteryCreateTx) (*types.Transaction, error) {
 	if parm == nil {
 		llog.Error("CreateRawLotteryCreateTx", "parm", parm)
@@ -125,6 +130,7 @@ func CreateRawLotteryCreateTx(parm *LotteryCreateTx) (*types.Transaction, error)
 	return tx, nil
 }
 
+// CreateRawLotteryBuyTx method
 func CreateRawLotteryBuyTx(parm *LotteryBuyTx) (*types.Transaction, error) {
 	if parm == nil {
 		llog.Error("CreateRawLotteryBuyTx", "parm", parm)
@@ -132,7 +138,7 @@ func CreateRawLotteryBuyTx(parm *LotteryBuyTx) (*types.Transaction, error) {
 	}
 
 	v := &LotteryBuy{
-		LotteryId: parm.LotteryId,
+		LotteryId: parm.LotteryID,
 		Amount:    parm.Amount,
 		Number:    parm.Number,
 		Way:       parm.Way,
@@ -155,6 +161,7 @@ func CreateRawLotteryBuyTx(parm *LotteryBuyTx) (*types.Transaction, error) {
 	return tx, nil
 }
 
+// CreateRawLotteryDrawTx method
 func CreateRawLotteryDrawTx(parm *LotteryDrawTx) (*types.Transaction, error) {
 	if parm == nil {
 		llog.Error("CreateRawLotteryDrawTx", "parm", parm)
@@ -162,7 +169,7 @@ func CreateRawLotteryDrawTx(parm *LotteryDrawTx) (*types.Transaction, error) {
 	}
 
 	v := &LotteryDraw{
-		LotteryId: parm.LotteryId,
+		LotteryId: parm.LotteryID,
 	}
 	draw := &LotteryAction{
 		Ty:    LotteryActionDraw,
@@ -182,6 +189,7 @@ func CreateRawLotteryDrawTx(parm *LotteryDrawTx) (*types.Transaction, error) {
 	return tx, nil
 }
 
+// CreateRawLotteryCloseTx method
 func CreateRawLotteryCloseTx(parm *LotteryCloseTx) (*types.Transaction, error) {
 	if parm == nil {
 		llog.Error("CreateRawLotteryCloseTx", "parm", parm)
@@ -189,7 +197,7 @@ func CreateRawLotteryCloseTx(parm *LotteryCloseTx) (*types.Transaction, error) {
 	}
 
 	v := &LotteryClose{
-		LotteryId: parm.LotteryId,
+		LotteryId: parm.LotteryID,
 	}
 	close := &LotteryAction{
 		Ty:    LotteryActionClose,

plugin/dapp/lottery/types/tx.go

@@ -4,26 +4,30 @@
 
 package types
 
+// LotteryCreateTx for construction
 type LotteryCreateTx struct {
 	PurBlockNum  int64 `json:"purBlockNum"`
 	DrawBlockNum int64 `json:"drawBlockNum"`
 	Fee          int64 `json:"fee"`
 }
 
+// LotteryBuyTx for construction
 type LotteryBuyTx struct {
-	LotteryId string `json:"lotteryId"`
+	LotteryID string `json:"lotteryId"`
 	Amount    int64  `json:"amount"`
 	Number    int64  `json:"number"`
 	Way       int64  `json:"way"`
 	Fee       int64  `json:"fee"`
 }
 
+// LotteryDrawTx for construction
 type LotteryDrawTx struct {
-	LotteryId string `json:"lotteryId"`
+	LotteryID string `json:"lotteryId"`
 	Fee       int64  `json:"fee"`
 }
 
+// LotteryCloseTx for construction
 type LotteryCloseTx struct {
-	LotteryId string `json:"lotteryId"`
+	LotteryID string `json:"lotteryId"`
 	Fee       int64  `json:"fee"`
 }

plugin/dapp/lottery/types/types.go

@@ -19,6 +19,7 @@ const (
 	TyLogLotteryClose  = 804
 )
 
+// Lottery name
 const (
 	LotteryX = "lottery"
 )