commit 1803123ebf8454d1b92b5202d580d61cf830c92e
parent 9c0b3ab7898c3cbedad5d697cbd3b3e4abe1d473
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Fri, 15 Dec 2023 20:28:55 -0500
refactor better var name
Diffstat:
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -55,7 +55,7 @@ func (p *Poker) GetOrCreateGame(roomID RoomID, pokerTableID int64, pokerTableMin
PokerTableMinBet: pokerTableMinBet,
PokerTableIsTest: pokerTableIsTest,
PlayersEventCh: make(chan PlayerEvent),
- Players: make([]*PokerStandingPlayer, NbPlayers),
+ Players: make([]*SeatedPlayer, NbPlayers),
DealerSeatIdx: atomic.Int32{},
}
g.DealerSeatIdx.Store(-1)
@@ -100,7 +100,7 @@ type Ongoing struct {
mainPot atomic.Uint64
}
-type PokerStandingPlayer struct {
+type SeatedPlayer struct {
UserID database.UserID
Username database.Username
Cash database.PokerChip
@@ -108,12 +108,12 @@ type PokerStandingPlayer struct {
}
// Return either or not a player is eligible to play a game
-func (p *PokerStandingPlayer) isEligible(pokerTableMinBet database.PokerChip) bool {
+func (p *SeatedPlayer) isEligible(pokerTableMinBet database.PokerChip) bool {
return p != nil && p.Cash >= pokerTableMinBet
}
type PokerPlayer struct {
- *PokerStandingPlayer
+ *SeatedPlayer
RoundTotalBet database.PokerChip
Bet database.PokerChip
AllInMaxGain database.PokerChip
@@ -150,7 +150,7 @@ type PokerGame struct {
PokerTableMinBet database.PokerChip
PokerTableIsTest bool
PlayersEventCh chan PlayerEvent
- Players []*PokerStandingPlayer
+ Players []*SeatedPlayer
PlayersMtx sync.RWMutex
Ongoing *Ongoing
DealerSeatIdx atomic.Int32
@@ -364,7 +364,7 @@ func (g *PokerGame) UnSitPlayer(db *database.DkfDB, roomID RoomID, authUser *dat
return errors.New("player is not sit")
}
-func (g *PokerGame) UnSitPlayer1(db *database.DkfDB, roomID RoomID, standingPlayer *PokerStandingPlayer, idx int) error {
+func (g *PokerGame) UnSitPlayer1(db *database.DkfDB, roomID RoomID, standingPlayer *SeatedPlayer, idx int) error {
roomTopic := roomID.Topic()
standingPlayerUsername := standingPlayer.Username
@@ -418,7 +418,7 @@ func (g *PokerGame) SitPlayer(authUser *database.User, pos int, chips database.P
if g.Players[pos] != nil {
return errors.New("seat already taken")
}
- g.Players[pos] = &PokerStandingPlayer{UserID: authUser.ID, Username: authUser.Username, Cash: chips, LastActionTS: time.Now()}
+ g.Players[pos] = &SeatedPlayer{UserID: authUser.ID, Username: authUser.Username, Cash: chips, LastActionTS: time.Now()}
return nil
}
@@ -436,7 +436,7 @@ func NewOngoing(g *PokerGame) *Ongoing {
g.PlayersMtx.RLock()
for idx, p := range g.Players {
if p.isEligible(g.PokerTableMinBet) {
- players = append(players, &PokerPlayer{PokerStandingPlayer: p, SeatIdx: idx})
+ players = append(players, &PokerPlayer{SeatedPlayer: p, SeatIdx: idx})
}
}
g.PlayersMtx.RUnlock()
diff --git a/pkg/web/handlers/poker/poker_test.go b/pkg/web/handlers/poker/poker_test.go
@@ -6,10 +6,10 @@ import (
)
func Test_sortGameResults(t *testing.T) {
- p1 := &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 10}
- p2 := &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 20}
- p3 := &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p3"}, RoundTotalBet: 30}
- p4 := &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 100}
+ p1 := &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 10}
+ p2 := &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 20}
+ p3 := &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p3"}, RoundTotalBet: 30}
+ p4 := &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 100}
arr := []GameResult{
{1, []*PokerPlayer{p2, p4, p1, p3}},
}
@@ -25,10 +25,10 @@ func Test_processPot(t *testing.T) {
var arr []GameResult
var res []PlayerGain
- p1 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 100, AllInMaxGain: 400}
- p2 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 200, AllInMaxGain: 700}
- p3 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p3"}, RoundTotalBet: 300, AllInMaxGain: 900}
- p4 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 400}
+ p1 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 100, AllInMaxGain: 400}
+ p2 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 200, AllInMaxGain: 700}
+ p3 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p3"}, RoundTotalBet: 300, AllInMaxGain: 900}
+ p4 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 400}
arr = []GameResult{
{1, []*PokerPlayer{p2, p4, p1, p3}},
}
@@ -39,10 +39,10 @@ func Test_processPot(t *testing.T) {
assert.Equal(t, 250, res[2].Gain)
assert.Equal(t, 250, res[3].Gain)
- p1 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 10, AllInMaxGain: 40}
- p2 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 20, AllInMaxGain: 70}
- p3 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p3"}, RoundTotalBet: 300, AllInMaxGain: 630}
- p4 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 400}
+ p1 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 10, AllInMaxGain: 40}
+ p2 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 20, AllInMaxGain: 70}
+ p3 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p3"}, RoundTotalBet: 300, AllInMaxGain: 630}
+ p4 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 400}
arr = []GameResult{
{1, []*PokerPlayer{p2, p4, p1, p3}},
}
@@ -53,8 +53,8 @@ func Test_processPot(t *testing.T) {
assert.Equal(t, 445, res[2].Gain)
assert.Equal(t, 445, res[3].Gain)
- p1 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p1"}, RoundTotalBet: 500}
- p2 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 500, AllInMaxGain: 1000}
+ p1 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p1"}, RoundTotalBet: 500}
+ p2 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 500, AllInMaxGain: 1000}
arr = []GameResult{
{1, []*PokerPlayer{p2}},
{2, []*PokerPlayer{p1}},
@@ -65,10 +65,10 @@ func Test_processPot(t *testing.T) {
assert.Equal(t, "p2", res[0].Player.Username)
assert.Equal(t, 1000, res[0].Gain)
- p1 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p1"}, RoundTotalBet: 5}
- p2 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p2"}, RoundTotalBet: 5}
- p3 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p3"}, RoundTotalBet: 5}
- p4 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 5}
+ p1 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p1"}, RoundTotalBet: 5}
+ p2 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p2"}, RoundTotalBet: 5}
+ p3 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p3"}, RoundTotalBet: 5}
+ p4 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 1, Username: "p4"}, RoundTotalBet: 5}
//p5 = &PokerPlayer{Cash: 1, RoundTotalBet: 3, Folded: true, Username: "p5"}
arr = []GameResult{
{1, []*PokerPlayer{p1, p2, p3}},
@@ -81,8 +81,8 @@ func Test_processPot(t *testing.T) {
assert.Equal(t, 8, res[1].Gain)
assert.Equal(t, 7, res[2].Gain)
- p1 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 900, AllInMaxGain: 1560}
- p2 = &PokerPlayer{PokerStandingPlayer: &PokerStandingPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 640, AllInMaxGain: 1300}
+ p1 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p1"}, RoundTotalBet: 900, AllInMaxGain: 1560}
+ p2 = &PokerPlayer{SeatedPlayer: &SeatedPlayer{Cash: 0, Username: "p2"}, RoundTotalBet: 640, AllInMaxGain: 1300}
arr = []GameResult{
{1, []*PokerPlayer{p2}},
{2, []*PokerPlayer{p1}},
@@ -104,20 +104,20 @@ func Test_isRoundSettled(t *testing.T) {
want bool
}{
{"1", args{players: []*PokerPlayer{
- {Bet: 10, PokerStandingPlayer: &PokerStandingPlayer{Cash: 0}},
- {Bet: 20, PokerStandingPlayer: &PokerStandingPlayer{Cash: 0}},
- {Bet: 30, PokerStandingPlayer: &PokerStandingPlayer{Cash: 1}},
- {Bet: 30, PokerStandingPlayer: &PokerStandingPlayer{Cash: 1}}}}, true},
+ {Bet: 10, SeatedPlayer: &SeatedPlayer{Cash: 0}},
+ {Bet: 20, SeatedPlayer: &SeatedPlayer{Cash: 0}},
+ {Bet: 30, SeatedPlayer: &SeatedPlayer{Cash: 1}},
+ {Bet: 30, SeatedPlayer: &SeatedPlayer{Cash: 1}}}}, true},
{"2", args{players: []*PokerPlayer{
- {Bet: 100, PokerStandingPlayer: &PokerStandingPlayer{Cash: 0}},
- {Bet: 20, PokerStandingPlayer: &PokerStandingPlayer{Cash: 0}},
- {Bet: 30, PokerStandingPlayer: &PokerStandingPlayer{Cash: 1}},
- {Bet: 30, PokerStandingPlayer: &PokerStandingPlayer{Cash: 1}}}}, false},
+ {Bet: 100, SeatedPlayer: &SeatedPlayer{Cash: 0}},
+ {Bet: 20, SeatedPlayer: &SeatedPlayer{Cash: 0}},
+ {Bet: 30, SeatedPlayer: &SeatedPlayer{Cash: 1}},
+ {Bet: 30, SeatedPlayer: &SeatedPlayer{Cash: 1}}}}, false},
{"3", args{players: []*PokerPlayer{
- {Bet: 10, PokerStandingPlayer: &PokerStandingPlayer{Cash: 0}},
- {Bet: 200, PokerStandingPlayer: &PokerStandingPlayer{Cash: 0}},
- {Bet: 30, PokerStandingPlayer: &PokerStandingPlayer{Cash: 1}},
- {Bet: 30, PokerStandingPlayer: &PokerStandingPlayer{Cash: 1}}}}, false},
+ {Bet: 10, SeatedPlayer: &SeatedPlayer{Cash: 0}},
+ {Bet: 200, SeatedPlayer: &SeatedPlayer{Cash: 0}},
+ {Bet: 30, SeatedPlayer: &SeatedPlayer{Cash: 1}},
+ {Bet: 30, SeatedPlayer: &SeatedPlayer{Cash: 1}}}}, false},
// TODO: Add test cases.
}
for _, tt := range tests {
