get rid of TEST_TIME constant

diff --git a/src/game/poker/holdem.rs b/src/game/poker/holdem.rs
index 6a014c025ff1cf6bcda6ee29df15879e2ea27877..139f82e723b006072da19e5821b7e5e8205b28fa 100644 (file)
--- 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 ea3ac4d93bce4a739d154da1aabe4d1be5f43c13..fa5b9890af43f0687fb075133e5af7611467482f 100644 (file)
--- 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 a2e84618881449f5d6df16be635ce8964c823eaf..9f5e5546919e9d17b6c04c108e0172c4326fdf9b 100644 (file)
--- 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))
     }