Commit 14a2af66 authored by vipwzw's avatar vipwzw

auto ci

parent 9e3a8968
......@@ -167,7 +167,7 @@ func pokerbullQuery(cmd *cobra.Command, args []string) {
indexstr, _ := cmd.Flags().GetString("index")
index, _ := strconv.ParseInt(indexstr, 10, 64)
gameIDs, _ := cmd.Flags().GetString("gameIDs")
round,_ := cmd.Flags().GetString("round")
round, _ := cmd.Flags().GetString("round")
var params rpctypes.Query4Jrpc
params.Execer = pkt.PokerBullX
......@@ -186,14 +186,14 @@ func pokerbullQuery(cmd *cobra.Command, args []string) {
ctx.Run()
} else {
params.FuncName = pkt.FuncNameQueryGameByRound
roundInt,err := strconv.ParseInt(round, 10, 32)
roundInt, err := strconv.ParseInt(round, 10, 32)
if err != nil {
fmt.Println(err)
return
}
req := &pkt.QueryPBGameByRound{
GameId:gameID,
Round:int32(roundInt),
GameId: gameID,
Round: int32(roundInt),
}
params.Payload = types.MustPBToJSON(req)
var res pkt.ReplyPBGameByRound
......
......@@ -418,7 +418,7 @@ func (action *Action) settleDefaultAccount(lastAddress string, game *pkt.PokerBu
// 佣金扣除
func (action *Action) defaultFeeTransfer(winner string, feeAddr string, fee int64, value int64) *types.Receipt {
receipt, err := action.coinsAccount.ExecTransfer(winner, feeAddr, action.execaddr, (value/types.Coin) * fee /**int64(result.Leverage)*/) //TODO Dealer:暂时不支持倍数
receipt, err := action.coinsAccount.ExecTransfer(winner, feeAddr, action.execaddr, (value/types.Coin)*fee /**int64(result.Leverage)*/) //TODO Dealer:暂时不支持倍数
if err != nil {
action.coinsAccount.ExecFrozen(winner, action.execaddr, (value/types.Coin)*fee) // rollback
logger.Error("GameSettleDefault.ExecTransfer", "addr", winner, "execaddr", action.execaddr, "amount",
......
......@@ -64,7 +64,7 @@ func (g *PokerBull) Query_QueryGameByRound(in *pkt.QueryPBGameByRound) (types.Me
}
roundPlayer := &pkt.PBPlayer{
Address: player.Address,
Ready : isReady,
Ready: isReady,
}
roundPlayers = append(roundPlayers, roundPlayer)
}
......@@ -76,7 +76,6 @@ func (g *PokerBull) Query_QueryGameByRound(in *pkt.QueryPBGameByRound) (types.Me
result = game.Results[in.Round-1]
}
gameInfo := &pkt.ReplyPBGameByRound{
GameId: game.GameId,
Status: game.Status,
......@@ -84,7 +83,7 @@ func (g *PokerBull) Query_QueryGameByRound(in *pkt.QueryPBGameByRound) (types.Me
IsWaiting: game.IsWaiting,
Value: game.Value,
Players: roundPlayers,
Return: (game.Value/types.Coin) * pkt.WinnerReturn,
Return: (game.Value / types.Coin) * pkt.WinnerReturn,
}
return gameInfo, nil
......
......@@ -60,7 +60,6 @@ const (
CreatequitTx = "CreatequitTx"
)
const (
// ListDESC 降序
ListDESC = int32(0)
......
......@@ -6,10 +6,11 @@ package types
import (
context "context"
fmt "fmt"
math "math"
types "github.com/33cn/chain33/types"
proto "github.com/golang/protobuf/proto"
grpc "google.golang.org/grpc"
math "math"
)
// Reference imports to suppress errors if they are not otherwise used.
......
......@@ -7,10 +7,11 @@ package types
import (
"reflect"
"github.com/33cn/chain33/types"
"encoding/json"
log "github.com/33cn/chain33/common/log/log15"
"errors"
log "github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/types"
)
var (
......
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