From 729aca4c256069855cefb2dbc4781dfab60a62be Mon Sep 17 00:00:00 2001 From: Geoffrey Allott Date: Thu, 4 Mar 2021 18:23:28 +0000 Subject: [PATCH] get rid of TEST_TIME constant --- src/game/poker/holdem.rs | 4 ++-- src/game/whist.rs | 4 ++-- src/util/timestamp.rs | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/game/poker/holdem.rs b/src/game/poker/holdem.rs index 6a014c0..139f82e 100644 --- a/src/game/poker/holdem.rs +++ b/src/game/poker/holdem.rs @@ -601,12 +601,12 @@ mod tests { game.take_action(validated).unwrap(); } _ => { - let dealer_action = game.next_dealer_action(Timestamp::TEST_TIME); + let dealer_action = game.next_dealer_action(action.timestamp); if let DealerAction::TakeAction(ValidatedUserAction(dealer_action)) = dealer_action { assert_eq!(action, dealer_action); game.take_action(ValidatedUserAction(action)).unwrap(); } else { - panic!("Expected DealerAction::TakeAction, got {:?}", dealer_action); + panic!("Expected DealerAction::TakeAction{{ {:?} }}, got {:?}", action, dealer_action); } } } diff --git a/src/game/whist.rs b/src/game/whist.rs index ea3ac4d..fa5b989 100644 --- a/src/game/whist.rs +++ b/src/game/whist.rs @@ -425,12 +425,12 @@ mod tests { game.take_action(validated).unwrap(); } _ => { - let dealer_action = game.next_dealer_action(Timestamp::TEST_TIME); + let dealer_action = game.next_dealer_action(action.timestamp); if let DealerAction::TakeAction(ValidatedUserAction(dealer_action)) = dealer_action { assert_eq!(action, dealer_action); game.take_action(ValidatedUserAction(action)).unwrap(); } else { - panic!("Expected DealerAction::TakeAction, got {:?}", dealer_action); + panic!("Expected DealerAction::TakeAction{{ {:?} }}, got {:?}", action, dealer_action); } } } diff --git a/src/util/timestamp.rs b/src/util/timestamp.rs index a2e8461..9f5e554 100644 --- a/src/util/timestamp.rs +++ b/src/util/timestamp.rs @@ -7,9 +7,6 @@ use redis::{FromRedisValue, Value, RedisResult, ToRedisArgs, RedisWrite, Numeric pub struct Timestamp(i64); impl Timestamp { - #[cfg(test)] - pub const TEST_TIME: Timestamp = Timestamp(0); - pub fn plus_millis(self, millis: i64) -> Self { Timestamp(self.0.saturating_add(millis)) } -- 2.34.1