fix go vet

plugin/dapp/ticket/executor/query.go

@@ -25,7 +25,7 @@ func (ticket *Ticket) Query_MinerAddress(param *types.ReqString) (types.Message,
 	if value == nil || err != nil {
 		return nil, types.ErrNotFound
 	}
-	return &types.ReplyString{string(value)}, nil
+	return &types.ReplyString{Data: string(value)}, nil
 }
 
 // Query_MinerSourceList query miner src list

plugin/dapp/ticket/executor/ticket.go

@@ -71,7 +71,7 @@ func (t *Ticket) saveTicketBind(b *ty.ReceiptTicketBind) (kvs []*types.KeyValue)
 		kvs = append(kvs, kv)
 	}
 
-	kv := &types.KeyValue{calcBindReturnKey(b.ReturnAddress), []byte(b.NewMinerAddress)}
+	kv := &types.KeyValue{Key: calcBindReturnKey(b.ReturnAddress), Value: []byte(b.NewMinerAddress)}
 	//tlog.Warn("tb:add", "key", string(kv.Key), "value", string(kv.Value))
 	kvs = append(kvs, kv)
 	kv = &types.KeyValue{
@@ -92,7 +92,7 @@ func (t *Ticket) delTicketBind(b *ty.ReceiptTicketBind) (kvs []*types.KeyValue)
 	kvs = append(kvs, kv)
 	if len(b.OldMinerAddress) > 0 {
 		//恢复旧的绑定
-		kv := &types.KeyValue{calcBindReturnKey(b.ReturnAddress), []byte(b.OldMinerAddress)}
+		kv := &types.KeyValue{Key: calcBindReturnKey(b.ReturnAddress), Value: []byte(b.OldMinerAddress)}
 		kvs = append(kvs, kv)
 		kv = &types.KeyValue{
 			Key:   calcBindMinerKey(b.OldMinerAddress, b.ReturnAddress),
@@ -101,7 +101,7 @@ func (t *Ticket) delTicketBind(b *ty.ReceiptTicketBind) (kvs []*types.KeyValue)
 		kvs = append(kvs, kv)
 	} else {
 		//删除旧的数据
-		kv := &types.KeyValue{calcBindReturnKey(b.ReturnAddress), nil}
+		kv := &types.KeyValue{Key: calcBindReturnKey(b.ReturnAddress), Value: nil}
 		kvs = append(kvs, kv)
 	}
 	return kvs

plugin/dapp/ticket/executor/ticketdb.go

@@ -77,7 +77,7 @@ func (t *DB) GetReceiptLog() *types.ReceiptLog {
 // GetKVSet get kv set
 func (t *DB) GetKVSet() (kvset []*types.KeyValue) {
 	value := types.Encode(&t.Ticket)
-	kvset = append(kvset, &types.KeyValue{Key(t.TicketId), value})
+	kvset = append(kvset, &types.KeyValue{Key: Key(t.TicketId), Value: value})
 	return kvset
 }
 
@@ -144,7 +144,7 @@ func (action *Action) GenesisInit(genesis *ty.TicketGenesis) (*types.Receipt, er
 		logs = append(logs, receipt.Logs...)
 		kv = append(kv, receipt.KV...)
 	}
-	receipt := &types.Receipt{types.ExecOk, kv, logs}
+	receipt := &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
 
@@ -157,7 +157,7 @@ func saveBind(db dbm.KV, tbind *ty.TicketBind) {
 
 func getBindKV(tbind *ty.TicketBind) (kvset []*types.KeyValue) {
 	value := types.Encode(tbind)
-	kvset = append(kvset, &types.KeyValue{BindKey(tbind.ReturnAddress), value})
+	kvset = append(kvset, &types.KeyValue{Key: BindKey(tbind.ReturnAddress), Value: value})
 	return kvset
 }
 
@@ -205,7 +205,7 @@ func (action *Action) TicketBind(tbind *ty.TicketBind) (*types.Receipt, error) {
 	saveBind(action.db, tbind)
 	kv := getBindKV(tbind)
 	kvs = append(kvs, kv...)
-	receipt := &types.Receipt{types.ExecOk, kvs, logs}
+	receipt := &types.Receipt{Ty: types.ExecOk, KV: kvs, Logs: logs}
 	return receipt, nil
 }
 
@@ -251,7 +251,7 @@ func (action *Action) TicketOpen(topen *ty.TicketOpen) (*types.Receipt, error) {
 		logs = append(logs, receipt.Logs...)
 		kv = append(kv, receipt.KV...)
 	}
-	receipt := &types.Receipt{types.ExecOk, kv, logs}
+	receipt := &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
 
@@ -339,7 +339,7 @@ func (action *Action) TicketMiner(miner *ty.TicketMiner, index int) (*types.Rece
 	kv = append(kv, receipt1.KV...)
 	logs = append(logs, receipt2.Logs...)
 	kv = append(kv, receipt2.KV...)
-	return &types.Receipt{types.ExecOk, kv, logs}, nil
+	return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, nil
 }
 
 // TicketClose close tick
@@ -406,7 +406,7 @@ func (action *Action) TicketClose(tclose *ty.TicketClose) (*types.Receipt, error
 		}
 		t.Save(action.db)
 	}
-	receipt := &types.Receipt{types.ExecOk, kv, logs}
+	receipt := &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
 
@@ -438,5 +438,5 @@ func Infos(db dbm.KV, tinfos *ty.TicketInfos) (types.Message, error) {
 		}
 		tickets = append(tickets, ticket)
 	}
-	return &ty.ReplyTicketList{tickets}, nil
+	return &ty.ReplyTicketList{Tickets: tickets}, nil
 }

plugin/dapp/ticket/rpc/types.go

@@ -13,6 +13,7 @@ import (
 type Jrpc struct {
 	cli *channelClient
 }
+
 // Grpc grpc type
 type Grpc struct {
 	*channelClient

plugin/dapp/ticket/types/errors.go

@@ -8,21 +8,21 @@ import "errors"
 
 var (
 	// ErrNoTicket error type
-	ErrNoTicket       = errors.New("ErrNoTicket")
+	ErrNoTicket = errors.New("ErrNoTicket")
 	// ErrTicketCount error type
-	ErrTicketCount    = errors.New("ErrTicketCount")
+	ErrTicketCount = errors.New("ErrTicketCount")
 	// ErrTime error type
-	ErrTime           = errors.New("ErrTime")
+	ErrTime = errors.New("ErrTime")
 	// ErrTicketClosed err type
-	ErrTicketClosed   = errors.New("ErrTicketClosed")
+	ErrTicketClosed = errors.New("ErrTicketClosed")
 	// ErrEmptyMinerTx err type
-	ErrEmptyMinerTx   = errors.New("ErrEmptyMinerTx")
+	ErrEmptyMinerTx = errors.New("ErrEmptyMinerTx")
 	// ErrMinerNotPermit err type
 	ErrMinerNotPermit = errors.New("ErrMinerNotPermit")
 	// ErrMinerAddr err type
-	ErrMinerAddr      = errors.New("ErrMinerAddr")
+	ErrMinerAddr = errors.New("ErrMinerAddr")
 	// ErrModify err type
-	ErrModify         = errors.New("ErrModify")
+	ErrModify = errors.New("ErrModify")
 	// ErrMinerTx err type
-	ErrMinerTx        = errors.New("ErrMinerTx")
+	ErrMinerTx = errors.New("ErrMinerTx")
 )

plugin/dapp/ticket/types/ticket.go

@@ -17,13 +17,13 @@ const (
 	//log for ticket
 
 	//TyLogNewTicket new ticket log type
-	TyLogNewTicket   = 111
+	TyLogNewTicket = 111
 	// TyLogCloseTicket close ticket log type
 	TyLogCloseTicket = 112
 	// TyLogMinerTicket miner ticket log type
 	TyLogMinerTicket = 113
 	// TyLogTicketBind bind ticket log type
-	TyLogTicketBind  = 114
+	TyLogTicketBind = 114
 )
 
 //ticket
@@ -31,21 +31,22 @@ const (
 	// TicketActionGenesis action type
 	TicketActionGenesis = 11
 	// TicketActionOpen action type
-	TicketActionOpen    = 12
+	TicketActionOpen = 12
 	// TicketActionClose action type
-	TicketActionClose   = 13
+	TicketActionClose = 13
 	// TicketActionList  action type
-	TicketActionList    = 14 //读的接口不直接经过transaction
+	TicketActionList = 14 //读的接口不直接经过transaction
 	// TicketActionInfos action type
-	TicketActionInfos   = 15 //读的接口不直接经过transaction
+	TicketActionInfos = 15 //读的接口不直接经过transaction
 	// TicketActionMiner action miner
-	TicketActionMiner   = 16
+	TicketActionMiner = 16
 	// TicketActionBind action bind
-	TicketActionBind    = 17
+	TicketActionBind = 17
 )
 
 // TicketOldParts old tick type
 const TicketOldParts = 3
+
 // TicketCountOpenOnce count open once
 const TicketCountOpenOnce = 1000
 

plugin/dapp/ticket/wallet/exec.go

@@ -29,7 +29,7 @@ func (policy *ticketPolicy) On_CloseTickets(req *types.ReqNil) (types.Message, e
 // On_WalletGetTickets get ticket
 func (policy *ticketPolicy) On_WalletGetTickets(req *types.ReqNil) (types.Message, error) {
 	tickets, privs, err := policy.getTicketsByStatus(1)
-	tks := &ty.ReplyWalletTickets{tickets, privs}
+	tks := &ty.ReplyWalletTickets{Tickets: tickets, Privkeys: privs}
 	return tks, err
 }
 

plugin/dapp/ticket/wallet/ticket.go

@@ -312,7 +312,7 @@ func (policy *ticketPolicy) forceCloseAllTicket(height int64) (*types.ReplyHashe
 }
 
 func (policy *ticketPolicy) getTickets(addr string, status int32) ([]*ty.Ticket, error) {
-	reqaddr := &ty.TicketList{addr, status}
+	reqaddr := &ty.TicketList{Addr: addr, Status: status}
 	api := policy.getAPI()
 	msg, err := api.Query(ty.TicketX, "TicketList", reqaddr)
 	if err != nil {
@@ -369,8 +369,8 @@ func (policy *ticketPolicy) closeTickets(priv crypto.PrivKey, ids []string) ([]b
 	}
 	bizlog.Info("closeTickets", "ids", ids[0:end])
 	ta := &ty.TicketAction{}
-	tclose := &ty.TicketClose{ids[0:end]}
-	ta.Value = &ty.TicketAction_Tclose{tclose}
+	tclose := &ty.TicketClose{TicketId: ids[0:end]}
+	ta.Value = &ty.TicketAction_Tclose{Tclose: tclose}
 	ta.Ty = ty.TicketActionClose
 	return policy.getWalletOperate().SendTransaction(ta, []byte(ty.TicketX), priv, "")
 }
@@ -551,7 +551,7 @@ func (policy *ticketPolicy) openticket(mineraddr, returnaddr string, priv crypto
 		hashList[i] = pubHash
 	}
 	topen.PubHashes = hashList
-	ta.Value = &ty.TicketAction_Topen{topen}
+	ta.Value = &ty.TicketAction_Topen{Topen: topen}
 	ta.Ty = ty.TicketActionOpen
 	return policy.walletOperate.SendTransaction(ta, []byte(ty.TicketX), priv, "")
 }
@@ -626,7 +626,7 @@ func (policy *ticketPolicy) buyTicket(height int64) ([][]byte, int, error) {
 }
 
 func (policy *ticketPolicy) getMinerColdAddr(addr string) ([]string, error) {
-	reqaddr := &types.ReqString{addr}
+	reqaddr := &types.ReqString{Data: addr}
 	api := policy.walletOperate.GetAPI()
 	msg, err := api.Query(ty.TicketX, "MinerSourceList", reqaddr)
 	if err != nil {

plugin/dapp/ticket/wallet/ticket_test.go

@@ -26,11 +26,11 @@ func Test_WalletTicket(t *testing.T) {
 	defer mock33.Close()
 	err := mock33.WaitHeight(0)
 	assert.Nil(t, err)
-	msg, err := mock33.GetAPI().Query(ty.TicketX, "TicketList", &ty.TicketList{"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 1})
+	msg, err := mock33.GetAPI().Query(ty.TicketX, "TicketList", &ty.TicketList{Addr: "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", Status: 1})
 	assert.Nil(t, err)
 	ticketList := msg.(*ty.ReplyTicketList)
 	assert.NotNil(t, ticketList)
-	return
+	//return
 	ticketwallet.FlushTicket(mock33.GetAPI())
 	err = mock33.WaitHeight(2)
 	assert.Nil(t, err)