fix bug when betting is completed by the blinds

diff --git a/src/game/poker/holdem.rs b/src/game/poker/holdem.rs
index 579afcc39d58ec043e5d3a192279d7bd23c4ddb3..cc10f5a8d1189547142623096436963aa97c8125 100644 (file)
--- a/src/game/poker/holdem.rs
+++ b/src/game/poker/holdem.rs
@@ -426,6 +426,9 @@ impl Game for TexasHoldEm {
                 *self.stacks.entry(username).or_default() -= chips;
                 self.active = self.seats.player_after_where(username, |username| self.in_hand.contains(&username));
                 self.state = State::PreFlopBetting;
+                if self.betting_round_completed() {
+                    self.state = State::DealingFlop;
+                }
                 Ok(())
             }
             (_, Action::Bet { chips }) => {
@@ -434,8 +437,7 @@ impl Game for TexasHoldEm {
                 *self.stacks.entry(username).or_default() -= chips;
                 if self.betting_round_completed() {
                     self.advance_betting_round()?;
-                } else {
-                    self.active = self.seats.player_after_where(username, |username| self.is_able_to_bet(username));
+                } else { self.active = self.seats.player_after_where(username, |username| self.is_able_to_bet(username));
                 }
                 Ok(())
             }
@@ -1728,4 +1730,155 @@ mod tests {
 
         test_game(actions, settings, seed);
     }
+
+    #[test]
+    fn post_small_blind_amount_as_big_blind_with_remaining_stack() {
+        let actions = r#"[
+            {"timestamp":1685134926351,"username":"Aga","action":{"action":"Join","seat":0,"chips":5000}},
+            {"timestamp":1685134936023,"username":"Geoff","action":{"action":"Join","seat":1,"chips":5000}},
+            {"timestamp":1685134977057,"username":"Peter","action":{"action":"Join","seat":2,"chips":5000}},
+            {"timestamp":1685134977057,"username":"Aga","action":{"action":"NextToDeal"}},
+            {"timestamp":1685134977057,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Spades"}}},
+            {"timestamp":1685134977058,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Ten","suit":"Diamonds"}}},
+            {"timestamp":1685134977058,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Diamonds"}}},
+            {"timestamp":1685134977058,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685134977059,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Clubs"}}},
+            {"timestamp":1685134977059,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Clubs"}}},
+            {"timestamp":1685134977059,"username":"Aga","action":{"action":"EndDeal"}},
+            {"timestamp":1685134977059,"username":"Geoff","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685134977060,"username":"Peter","action":{"action":"PostBlind","chips":50}},
+            {"timestamp":1685134983464,"username":"Aga","action":{"action":"Bet","chips":50}},
+            {"timestamp":1685134997759,"username":"Geoff","action":{"action":"Bet","chips":25}},
+            {"timestamp":1685135006085,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135006085,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Four","suit":"Hearts"}}},
+            {"timestamp":1685135006086,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685135006086,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685135021528,"username":"Geoff","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135023400,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135027788,"username":"Aga","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135027789,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Two","suit":"Hearts"}}},
+            {"timestamp":1685135037820,"username":"Geoff","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135038957,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135039807,"username":"Aga","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135039808,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685135042343,"username":"Geoff","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135043193,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135045033,"username":"Aga","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135045034,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Clubs"}}},
+            {"timestamp":1685135045034,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Diamonds"}}},
+            {"timestamp":1685135045034,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Two","suit":"Spades"}}},
+            {"timestamp":1685135045035,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685135045035,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Clubs"}}},
+            {"timestamp":1685135045035,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Ten","suit":"Diamonds"}}},
+            {"timestamp":1685135045036,"username":"Geoff","action":{"action":"WinHand","chips":150,"hand":"Two Pair, 8s & 2s, T Kicker"}},
+            {"timestamp":1685135045036,"username":"Geoff","action":{"action":"NextToDeal"}},
+            {"timestamp":1685135045036,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Diamonds"}}},
+            {"timestamp":1685135045037,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Five","suit":"Hearts"}}},
+            {"timestamp":1685135045037,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685135045037,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Hearts"}}},
+            {"timestamp":1685135045038,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Hearts"}}},
+            {"timestamp":1685135045038,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Clubs"}}},
+            {"timestamp":1685135045038,"username":"Geoff","action":{"action":"EndDeal"}},
+            {"timestamp":1685135045038,"username":"Peter","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685135045039,"username":"Aga","action":{"action":"PostBlind","chips":50}},
+            {"timestamp":1685135095852,"username":"Geoff","action":{"action":"Fold"}},
+            {"timestamp":1685135099465,"username":"Peter","action":{"action":"Fold"}},
+            {"timestamp":1685135099466,"username":"Aga","action":{"action":"WinHand","chips":75,"hand":null}},
+            {"timestamp":1685135099466,"username":"Peter","action":{"action":"NextToDeal"}},
+            {"timestamp":1685135099467,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Spades"}}},
+            {"timestamp":1685135099467,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685135099467,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685135099467,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685135099467,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Clubs"}}},
+            {"timestamp":1685135099468,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Hearts"}}},
+            {"timestamp":1685135099468,"username":"Peter","action":{"action":"EndDeal"}},
+            {"timestamp":1685135099468,"username":"Aga","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685135099468,"username":"Geoff","action":{"action":"PostBlind","chips":50}},
+            {"timestamp":1685135113247,"username":"Peter","action":{"action":"Bet","chips":4925}},
+            {"timestamp":1685135119368,"username":"Aga","action":{"action":"Bet","chips":4950}},
+            {"timestamp":1685135122114,"username":"Geoff","action":{"action":"Bet","chips":5050}},
+            {"timestamp":1685135122115,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685135122115,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"King","suit":"Spades"}}},
+            {"timestamp":1685135122115,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Clubs"}}},
+            {"timestamp":1685135122116,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685135122116,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Two","suit":"Hearts"}}},
+            {"timestamp":1685135122116,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685135122117,"username":"Peter","action":{"action":"CommunityCard","card":{"rank":"King","suit":"Hearts"}}},
+            {"timestamp":1685135122117,"username":"Peter","action":{"action":"CommunityCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685135122117,"username":"Peter","action":{"action":"CommunityCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685135122118,"username":"Peter","action":{"action":"CommunityCard","card":{"rank":"Two","suit":"Diamonds"}}},
+            {"timestamp":1685135122118,"username":"Peter","action":{"action":"CommunityCard","card":{"rank":"Ten","suit":"Spades"}}},
+            {"timestamp":1685135122119,"username":"Aga","action":{"action":"WinHand","chips":14875,"hand":"Three of a Kind, Ks, AT Kickers"}},
+            {"timestamp":1685135122119,"username":"Peter","action":{"action":"WinHand","chips":125,"hand":"Pair of 2s, AKT Kickers"}},
+            {"timestamp":1685135122119,"username":"Geoff","action":{"action":"KnockedOut"}},
+            {"timestamp":1685135122120,"username":"Aga","action":{"action":"NextToDeal"}},
+            {"timestamp":1685135122120,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Spades"}}},
+            {"timestamp":1685135122120,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Seven","suit":"Clubs"}}},
+            {"timestamp":1685135122121,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685135122121,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685135122122,"username":"Aga","action":{"action":"EndDeal"}},
+            {"timestamp":1685135122122,"username":"Geoff","action":{"action":"PostBlind","chips":0}},
+            {"timestamp":1685135122122,"username":"Peter","action":{"action":"PostBlind","chips":50}},
+            {"timestamp":1685135159540,"username":"Aga","action":{"action":"Bet","chips":50}},
+            {"timestamp":1685135160909,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135160909,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685135160910,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Ten","suit":"Diamonds"}}},
+            {"timestamp":1685135160910,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685135169477,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135170716,"username":"Aga","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135170717,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Nine","suit":"Spades"}}},
+            {"timestamp":1685135173219,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135174421,"username":"Aga","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135174422,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Five","suit":"Hearts"}}},
+            {"timestamp":1685135175914,"username":"Peter","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135176954,"username":"Aga","action":{"action":"Bet","chips":0}},
+            {"timestamp":1685135176954,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685135176955,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Seven","suit":"Clubs"}}},
+            {"timestamp":1685135176955,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Spades"}}},
+            {"timestamp":1685135176955,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685135176956,"username":"Aga","action":{"action":"WinHand","chips":100,"hand":"Straight, T High"}},
+            {"timestamp":1685135176956,"username":"Geoff","action":{"action":"NextToDeal"}},
+            {"timestamp":1685135176956,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685135176956,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Clubs"}}},
+            {"timestamp":1685135176956,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Five","suit":"Hearts"}}},
+            {"timestamp":1685135176957,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Seven","suit":"Clubs"}}},
+            {"timestamp":1685135176957,"username":"Geoff","action":{"action":"EndDeal"}},
+            {"timestamp":1685135176957,"username":"Peter","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685135176957,"username":"Aga","action":{"action":"PostBlind","chips":50}},
+            {"timestamp":1685135199474,"username":"Peter","action":{"action":"Fold"}},
+            {"timestamp":1685135199474,"username":"Aga","action":{"action":"WinHand","chips":75,"hand":null}},
+            {"timestamp":1685135199475,"username":"Peter","action":{"action":"NextToDeal"}},
+            {"timestamp":1685135199475,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Spades"}}},
+            {"timestamp":1685135199475,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Hearts"}}},
+            {"timestamp":1685135199476,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685135199476,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Diamonds"}}},
+            {"timestamp":1685135199476,"username":"Peter","action":{"action":"EndDeal"}},
+            {"timestamp":1685135199476,"username":"Peter","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685135199477,"username":"Aga","action":{"action":"PostBlind","chips":50}},
+            {"timestamp":1685135294691,"username":"Peter","action":{"action":"Fold"}},
+            {"timestamp":1685135294691,"username":"Aga","action":{"action":"WinHand","chips":75,"hand":null}},
+            {"timestamp":1685135294692,"username":"Aga","action":{"action":"NextToDeal"}},
+            {"timestamp":1685135294692,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Diamonds"}}},
+            {"timestamp":1685135294692,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Diamonds"}}},
+            {"timestamp":1685135294693,"username":"Peter","action":{"action":"ReceiveCard","card":{"rank":"Five","suit":"Spades"}}},
+            {"timestamp":1685135294693,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685135294693,"username":"Aga","action":{"action":"EndDeal"}},
+            {"timestamp":1685135294693,"username":"Aga","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685135294693,"username":"Peter","action":{"action":"PostBlind","chips":25}},
+            {"timestamp":1685135294693,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Diamonds"}}},
+            {"timestamp":1685135294693,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685135294693,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Five","suit":"Spades"}}},
+            {"timestamp":1685135294693,"username":"Peter","action":{"action":"RevealCard","card":{"rank":"Eight","suit":"Diamonds"}}}
+        ]"#;
+
+        let actions = serde_json::from_str(actions).unwrap();
+
+        let settings = r#"{"format":"TexasHoldEm","title":"Crazy Venture","max_players":3,"small_blind":25,"starting_stack":5000,"round_length":null,"tournament_length":null,"action_timeout":null,"start_time":null,"hide_cards":false}"#;
+        let settings = serde_json::from_str(settings).unwrap();
+
+        let seed = r#"{"rng":"ChaCha20","seed":"ff2a961d4c967e1d09d98c672f5917d27fedecebdc8f325268e67097f4ffde67"}"#;
+        let seed = serde_json::from_str(seed).unwrap();
+
+        test_game(actions, settings, seed);
+    }
 }