rename game_state -> game_actions and fix clippy lints

diff --git a/src/client.rs b/src/client.rs
index dd11589a357173ee4c24d742eab775b8ccbc7b3d..e9b38d1ad7cab2ae0fc407b2c5d3c8a2be79e129 100644 (file)
--- a/src/client.rs
+++ b/src/client.rs
@@ -60,7 +60,7 @@ impl ConnectionState {
                 ClientState::LoggedIn { username, state: LoggedInState::InGame { ref mut game } } if game.id() == id => {
                     let id = game.id();
                     let from = game.actions_len();
-                    match self.server.game_state(id, from).await {
+                    match self.server.game_actions(id, from).await {
                         Ok(actions) => {
                             let actions_view: Vec<_> = actions.iter().map(|action| action.view_for(username)).collect();
                             for action in actions {
@@ -149,7 +149,10 @@ impl ConnectionState {
                 Err(err) => ServerMessage::CreateGameFailure { reason: err.to_string() },
             },
             (&mut ClientState::LoggedIn { username, .. }, ClientMessage::JoinGame { id }) => {
-                match (self.server.game_summary(id).await, self.server.game_state(id, 0).await, self.server.game_seed(id).await) {
+                let summary = self.server.game_summary(id).await;
+                let actions = self.server.game_actions(id, 0).await;
+                let seed = self.server.game_seed(id).await;
+                match (summary, actions, seed) {
                     (Ok(summary), Ok(actions), Ok(seed)) => {
                         let actions_view = actions.iter().map(|action| action.view_for(username)).collect();
                         let mut game = Game::new(summary.clone(), seed);
@@ -181,7 +184,7 @@ impl ConnectionState {
                             },
                             Ok(ActionStatus::Interrupted) => {
                                 debug!("Action {:?} was interrupted - updating game state", action);
-                                match self.server.game_state(id, len).await {
+                                match self.server.game_actions(id, len).await {
                                     Ok(actions) => {
                                         for new_action in actions {
                                             if let Err(err) = game.take_action(new_action) {

diff --git a/src/dealer.rs b/src/dealer.rs
index 9dece12a31455f439a9804530d39ff96c263b3b5..13d6a69a6e954509c714f3e7375ea7910df3bd9d 100644 (file)
--- a/src/dealer.rs
+++ b/src/dealer.rs
@@ -57,7 +57,7 @@ impl Dealer {
         info!("Dealer is retrieving updates for game {}", id);
         'retrieve_updates: loop {
             let from = self.dealer.game.actions_len();
-            let actions = self.server.game_state(id, from).await?;
+            let actions = self.server.game_actions(id, from).await?;
             info!("Got {} actions for game {}", actions.len(), id);
             for action in actions {
                 debug!("Taking action: {:?}", action);

diff --git a/src/server.rs b/src/server.rs
index 18c56a49a3917b9487c72e6485668268480b70ed..ab076b6c2d6213bfaf4abe041d96457fca48ff38 100644 (file)
--- a/src/server.rs
+++ b/src/server.rs
@@ -203,7 +203,7 @@ impl ServerState {
         Ok(summaries)
     }
 
-    pub async fn game_state(&mut self, id: i64, from: usize) -> RedisResult<Vec<ValidatedUserAction>> {
+    pub async fn game_actions(&mut self, id: i64, from: usize) -> RedisResult<Vec<ValidatedUserAction>> {
         let key = game_actions_key(id);
         let actions: Vec<AsJson<ValidatedUserAction>> = self.redis.lrange(&key, from as isize, -1).await?;
         Ok(actions.into_iter().map(AsJson::get).collect())