Commit e180c5ae authored by vipwzw's avatar vipwzw

fix linter

parent 9ddb8df2
...@@ -59,12 +59,12 @@ var ( ...@@ -59,12 +59,12 @@ var (
"TimeoutDone": BlackwhiteActionTimeoutDone, "TimeoutDone": BlackwhiteActionTimeoutDone,
} }
logInfo = map[int64]*types.LogInfo{ logInfo = map[int64]*types.LogInfo{
TyLogBlackwhiteCreate: {reflect.TypeOf(ReceiptBlackwhite{}), "LogBlackwhiteCreate"}, TyLogBlackwhiteCreate: {Ty: reflect.TypeOf(ReceiptBlackwhite{}), Name: "LogBlackwhiteCreate"},
TyLogBlackwhitePlay: {reflect.TypeOf(ReceiptBlackwhite{}), "LogBlackwhitePlay"}, TyLogBlackwhitePlay: {Ty: reflect.TypeOf(ReceiptBlackwhite{}), Name: "LogBlackwhitePlay"},
TyLogBlackwhiteShow: {reflect.TypeOf(ReceiptBlackwhite{}), "LogBlackwhiteShow"}, TyLogBlackwhiteShow: {Ty: reflect.TypeOf(ReceiptBlackwhite{}), Name: "LogBlackwhiteShow"},
TyLogBlackwhiteTimeout: {reflect.TypeOf(ReceiptBlackwhite{}), "LogBlackwhiteTimeout"}, TyLogBlackwhiteTimeout: {Ty: reflect.TypeOf(ReceiptBlackwhite{}), Name: "LogBlackwhiteTimeout"},
TyLogBlackwhiteDone: {reflect.TypeOf(ReceiptBlackwhite{}), "LogBlackwhiteDone"}, TyLogBlackwhiteDone: {Ty: reflect.TypeOf(ReceiptBlackwhite{}), Name: "LogBlackwhiteDone"},
TyLogBlackwhiteLoopInfo: {reflect.TypeOf(ReplyLoopResults{}), "LogBlackwhiteLoopInfo"}, TyLogBlackwhiteLoopInfo: {Ty: reflect.TypeOf(ReplyLoopResults{}), Name: "LogBlackwhiteLoopInfo"},
} }
) )
......
...@@ -45,10 +45,10 @@ type GameType struct { ...@@ -45,10 +45,10 @@ type GameType struct {
// GetLogMap get log // GetLogMap get log
func (gt *GameType) GetLogMap() map[int64]*types.LogInfo { func (gt *GameType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogCreateGame: {reflect.TypeOf(ReceiptGame{}), "LogCreateGame"}, TyLogCreateGame: {Ty: reflect.TypeOf(ReceiptGame{}), Name: "LogCreateGame"},
TyLogCancleGame: {reflect.TypeOf(ReceiptGame{}), "LogCancleGame"}, TyLogCancleGame: {Ty: reflect.TypeOf(ReceiptGame{}), Name: "LogCancleGame"},
TyLogMatchGame: {reflect.TypeOf(ReceiptGame{}), "LogMatchGame"}, TyLogMatchGame: {Ty: reflect.TypeOf(ReceiptGame{}), Name: "LogMatchGame"},
TyLogCloseGame: {reflect.TypeOf(ReceiptGame{}), "LogCloseGame"}, TyLogCloseGame: {Ty: reflect.TypeOf(ReceiptGame{}), Name: "LogCloseGame"},
} }
} }
......
...@@ -38,10 +38,10 @@ func NewType() *LotteryType { ...@@ -38,10 +38,10 @@ func NewType() *LotteryType {
// GetLogMap method // GetLogMap method
func (lottery *LotteryType) GetLogMap() map[int64]*types.LogInfo { func (lottery *LotteryType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogLotteryCreate: {reflect.TypeOf(ReceiptLottery{}), "LogLotteryCreate"}, TyLogLotteryCreate: {Ty: reflect.TypeOf(ReceiptLottery{}), Name: "LogLotteryCreate"},
TyLogLotteryBuy: {reflect.TypeOf(ReceiptLottery{}), "LogLotteryBuy"}, TyLogLotteryBuy: {Ty: reflect.TypeOf(ReceiptLottery{}), Name: "LogLotteryBuy"},
TyLogLotteryDraw: {reflect.TypeOf(ReceiptLottery{}), "LogLotteryDraw"}, TyLogLotteryDraw: {Ty: reflect.TypeOf(ReceiptLottery{}), Name: "LogLotteryDraw"},
TyLogLotteryClose: {reflect.TypeOf(ReceiptLottery{}), "LogLotteryClose"}, TyLogLotteryClose: {Ty: reflect.TypeOf(ReceiptLottery{}), Name: "LogLotteryClose"},
} }
} }
......
...@@ -16,25 +16,6 @@ var ( ...@@ -16,25 +16,6 @@ var (
// ParaX paracross exec name // ParaX paracross exec name
ParaX = "paracross" ParaX = "paracross"
glog = log.New("module", ParaX) glog = log.New("module", ParaX)
/*
logInfo = map[int64]*types.LogInfo{
TyLogParacrossCommit: {reflect.TypeOf(ReceiptParacrossCommit{}), "LogParacrossCommit"},
TyLogParacrossCommitDone: {reflect.TypeOf(ReceiptParacrossDone{}), "LogParacrossDone"},
TyLogParacrossCommitRecord: {reflect.TypeOf(ReceiptParacrossRecord{}), "LogParacrossCommitRecord"},
TyLogParaAssetTransfer: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogParacrossAssetTransfer"},
TyLogParaAssetWithdraw: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogParacrossAssetWithdraw"},
TyLogParacrossMiner: {reflect.TypeOf(ReceiptParacrossMiner{}), "LogParacrossMiner"},
TyLogParaAssetDeposit: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogParacrossAssetDeposit"},
}*/
// init query rpc
/* TODO-TODO
types.RegisterRPCQueryHandle("ParacrossGetTitle", &ParacrossGetTitle{})
types.RegisterRPCQueryHandle("paracrossListTitles", &paracrossListTitles{})
types.RegisterRPCQueryHandle("paracrossGetTitleHeight", &paracrossGetTitleHeight{})
types.RegisterRPCQueryHandle("paracrossGetAssetTxResult", &paracrossGetAssetTxResult{})
*/
) )
func init() { func init() {
...@@ -64,13 +45,13 @@ func NewType() *ParacrossType { ...@@ -64,13 +45,13 @@ func NewType() *ParacrossType {
// GetLogMap get receipt log map // GetLogMap get receipt log map
func (p *ParacrossType) GetLogMap() map[int64]*types.LogInfo { func (p *ParacrossType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogParacrossCommit: {reflect.TypeOf(ReceiptParacrossCommit{}), "LogParacrossCommit"}, TyLogParacrossCommit: {Ty: reflect.TypeOf(ReceiptParacrossCommit{}), Name: "LogParacrossCommit"},
TyLogParacrossCommitDone: {reflect.TypeOf(ReceiptParacrossDone{}), "LogParacrossCommitDone"}, TyLogParacrossCommitDone: {Ty: reflect.TypeOf(ReceiptParacrossDone{}), Name: "LogParacrossCommitDone"},
TyLogParacrossCommitRecord: {reflect.TypeOf(ReceiptParacrossRecord{}), "LogParacrossCommitRecord"}, TyLogParacrossCommitRecord: {Ty: reflect.TypeOf(ReceiptParacrossRecord{}), Name: "LogParacrossCommitRecord"},
TyLogParaAssetWithdraw: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogParaAssetWithdraw"}, TyLogParaAssetWithdraw: {Ty: reflect.TypeOf(types.ReceiptAccountTransfer{}), Name: "LogParaAssetWithdraw"},
TyLogParaAssetTransfer: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogParaAssetTransfer"}, TyLogParaAssetTransfer: {Ty: reflect.TypeOf(types.ReceiptAccountTransfer{}), Name: "LogParaAssetTransfer"},
TyLogParaAssetDeposit: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogParaAssetDeposit"}, TyLogParaAssetDeposit: {Ty: reflect.TypeOf(types.ReceiptAccountTransfer{}), Name: "LogParaAssetDeposit"},
TyLogParacrossMiner: {reflect.TypeOf(ReceiptParacrossMiner{}), "LogParacrossMiner"}, TyLogParacrossMiner: {Ty: reflect.TypeOf(ReceiptParacrossMiner{}), Name: "LogParacrossMiner"},
} }
} }
......
...@@ -47,9 +47,9 @@ func (t *PokerBullType) GetTypeMap() map[string]int32 { ...@@ -47,9 +47,9 @@ func (t *PokerBullType) GetTypeMap() map[string]int32 {
// GetLogMap 获取日志map // GetLogMap 获取日志map
func (t *PokerBullType) GetLogMap() map[int64]*types.LogInfo { func (t *PokerBullType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogPBGameStart: {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameStart"}, TyLogPBGameStart: {Ty: reflect.TypeOf(ReceiptPBGame{}), Name: "TyLogPBGameStart"},
TyLogPBGameContinue: {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameContinue"}, TyLogPBGameContinue: {Ty: reflect.TypeOf(ReceiptPBGame{}), Name: "TyLogPBGameContinue"},
TyLogPBGameQuit: {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameQuit"}, TyLogPBGameQuit: {Ty: reflect.TypeOf(ReceiptPBGame{}), Name: "TyLogPBGameQuit"},
TyLogPBGameQuery: {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameQuery"}, TyLogPBGameQuery: {Ty: reflect.TypeOf(ReceiptPBGame{}), Name: "TyLogPBGameQuery"},
} }
} }
...@@ -105,9 +105,9 @@ func (t *PrivacyType) GetName() string { ...@@ -105,9 +105,9 @@ func (t *PrivacyType) GetName() string {
// GetLogMap get PrivacyType log map // GetLogMap get PrivacyType log map
func (t *PrivacyType) GetLogMap() map[int64]*types.LogInfo { func (t *PrivacyType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogPrivacyFee: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogPrivacyFee"}, TyLogPrivacyFee: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogPrivacyFee"},
TyLogPrivacyInput: {reflect.TypeOf(PrivacyInput{}), "LogPrivacyInput"}, TyLogPrivacyInput: {Ty: reflect.TypeOf(PrivacyInput{}), Name: "LogPrivacyInput"},
TyLogPrivacyOutput: {reflect.TypeOf(PrivacyOutput{}), "LogPrivacyOutput"}, TyLogPrivacyOutput: {Ty: reflect.TypeOf(PrivacyOutput{}), Name: "LogPrivacyOutput"},
} }
} }
......
...@@ -86,13 +86,13 @@ func (r *RelayType) GetName() string { ...@@ -86,13 +86,13 @@ func (r *RelayType) GetName() string {
// GetLogMap return receipt log map function // GetLogMap return receipt log map function
func (r *RelayType) GetLogMap() map[int64]*types.LogInfo { func (r *RelayType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogRelayCreate: {reflect.TypeOf(ReceiptRelayLog{}), "LogRelayCreate"}, TyLogRelayCreate: {Ty: reflect.TypeOf(ReceiptRelayLog{}), Name: "LogRelayCreate"},
TyLogRelayRevokeCreate: {reflect.TypeOf(ReceiptRelayLog{}), "LogRelayRevokeCreate"}, TyLogRelayRevokeCreate: {Ty: reflect.TypeOf(ReceiptRelayLog{}), Name: "LogRelayRevokeCreate"},
TyLogRelayAccept: {reflect.TypeOf(ReceiptRelayLog{}), "LogRelayAccept"}, TyLogRelayAccept: {Ty: reflect.TypeOf(ReceiptRelayLog{}), Name: "LogRelayAccept"},
TyLogRelayRevokeAccept: {reflect.TypeOf(ReceiptRelayLog{}), "LogRelayRevokeAccept"}, TyLogRelayRevokeAccept: {Ty: reflect.TypeOf(ReceiptRelayLog{}), Name: "LogRelayRevokeAccept"},
TyLogRelayConfirmTx: {reflect.TypeOf(ReceiptRelayLog{}), "LogRelayConfirmTx"}, TyLogRelayConfirmTx: {Ty: reflect.TypeOf(ReceiptRelayLog{}), Name: "LogRelayConfirmTx"},
TyLogRelayFinishTx: {reflect.TypeOf(ReceiptRelayLog{}), "LogRelayFinishTx"}, TyLogRelayFinishTx: {Ty: reflect.TypeOf(ReceiptRelayLog{}), Name: "LogRelayFinishTx"},
TyLogRelayRcvBTCHead: {reflect.TypeOf(ReceiptRelayRcvBTCHeaders{}), "LogRelayRcvBTCHead"}, TyLogRelayRcvBTCHead: {Ty: reflect.TypeOf(ReceiptRelayRcvBTCHeaders{}), Name: "LogRelayRcvBTCHead"},
} }
} }
......
...@@ -82,10 +82,10 @@ func (ticket *TicketType) GetPayload() types.Message { ...@@ -82,10 +82,10 @@ func (ticket *TicketType) GetPayload() types.Message {
// GetLogMap get log map // GetLogMap get log map
func (ticket *TicketType) GetLogMap() map[int64]*types.LogInfo { func (ticket *TicketType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogNewTicket: {reflect.TypeOf(ReceiptTicket{}), "LogNewTicket"}, TyLogNewTicket: {Ty: reflect.TypeOf(ReceiptTicket{}), Name: "LogNewTicket"},
TyLogCloseTicket: {reflect.TypeOf(ReceiptTicket{}), "LogCloseTicket"}, TyLogCloseTicket: {Ty: reflect.TypeOf(ReceiptTicket{}), Name: "LogCloseTicket"},
TyLogMinerTicket: {reflect.TypeOf(ReceiptTicket{}), "LogMinerTicket"}, TyLogMinerTicket: {Ty: reflect.TypeOf(ReceiptTicket{}), Name: "LogMinerTicket"},
TyLogTicketBind: {reflect.TypeOf(ReceiptTicketBind{}), "LogTicketBind"}, TyLogTicketBind: {Ty: reflect.TypeOf(ReceiptTicketBind{}), Name: "LogTicketBind"},
} }
} }
......
...@@ -73,7 +73,7 @@ func main() { ...@@ -73,7 +73,7 @@ func main() {
panic(err) panic(err)
} }
approver := signatory.Signatory{cfg.Privkey} approver := signatory.Signatory{Privkey: cfg.Privkey}
server := rpc.NewServer() server := rpc.NewServer()
server.Register(&approver) server.Register(&approver)
......
...@@ -52,18 +52,18 @@ func (t *TokenType) GetTypeMap() map[string]int32 { ...@@ -52,18 +52,18 @@ func (t *TokenType) GetTypeMap() map[string]int32 {
// GetLogMap 获取log的映射对应关系 // GetLogMap 获取log的映射对应关系
func (t *TokenType) GetLogMap() map[int64]*types.LogInfo { func (t *TokenType) GetLogMap() map[int64]*types.LogInfo {
return map[int64]*types.LogInfo{ return map[int64]*types.LogInfo{
TyLogTokenTransfer: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogTokenTransfer"}, TyLogTokenTransfer: {Ty: reflect.TypeOf(types.ReceiptAccountTransfer{}), Name: "LogTokenTransfer"},
TyLogTokenDeposit: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogTokenDeposit"}, TyLogTokenDeposit: {Ty: reflect.TypeOf(types.ReceiptAccountTransfer{}), Name: "LogTokenDeposit"},
TyLogTokenExecTransfer: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogTokenExecTransfer"}, TyLogTokenExecTransfer: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogTokenExecTransfer"},
TyLogTokenExecWithdraw: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogTokenExecWithdraw"}, TyLogTokenExecWithdraw: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogTokenExecWithdraw"},
TyLogTokenExecDeposit: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogTokenExecDeposit"}, TyLogTokenExecDeposit: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogTokenExecDeposit"},
TyLogTokenExecFrozen: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogTokenExecFrozen"}, TyLogTokenExecFrozen: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogTokenExecFrozen"},
TyLogTokenExecActive: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogTokenExecActive"}, TyLogTokenExecActive: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogTokenExecActive"},
TyLogTokenGenesisTransfer: {reflect.TypeOf(types.ReceiptAccountTransfer{}), "LogTokenGenesisTransfer"}, TyLogTokenGenesisTransfer: {Ty: reflect.TypeOf(types.ReceiptAccountTransfer{}), Name: "LogTokenGenesisTransfer"},
TyLogTokenGenesisDeposit: {reflect.TypeOf(types.ReceiptExecAccountTransfer{}), "LogTokenGenesisDeposit"}, TyLogTokenGenesisDeposit: {Ty: reflect.TypeOf(types.ReceiptExecAccountTransfer{}), Name: "LogTokenGenesisDeposit"},
TyLogPreCreateToken: {reflect.TypeOf(ReceiptToken{}), "LogPreCreateToken"}, TyLogPreCreateToken: {Ty: reflect.TypeOf(ReceiptToken{}), Name: "LogPreCreateToken"},
TyLogFinishCreateToken: {reflect.TypeOf(ReceiptToken{}), "LogFinishCreateToken"}, TyLogFinishCreateToken: {Ty: reflect.TypeOf(ReceiptToken{}), Name: "LogFinishCreateToken"},
TyLogRevokeCreateToken: {reflect.TypeOf(ReceiptToken{}), "LogRevokeCreateToken"}, TyLogRevokeCreateToken: {Ty: reflect.TypeOf(ReceiptToken{}), Name: "LogRevokeCreateToken"},
} }
} }
......
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