rstnode: add basic map i/o mechanism for server and client

1 files changed, 4 insertions, 4 deletions

diff --git a/games/rstnode/rst-core/src/server.rs b/games/rstnode/rst-core/src/server.rs
index 68fa2a074e34..a550a8396395 100644
--- a/games/rstnode/rst-core/src/server.rs
+++ b/games/rstnode/rst-core/src/server.rs
@@ -12,7 +12,7 @@ use crate::{
         game::Action, AuthErr, Lobby, LobbyErr, LobbyId, LobbyUpdate, MatchErr, MatchId, RegErr,
         Response, UpdateState, User, UserId,
     },
-    GameIf, Match,
+    GameIf, Lock, LockMap, Match,
 };
 use async_std::sync::{Arc, Mutex};
 use async_trait::async_trait;
@@ -32,7 +32,7 @@ pub enum ServerErr {
 
 /// The game's server backend
 pub struct Server {
-    matches: BTreeMap<MatchId, Mutex<Match>>,
+    matches: LockMap<MatchId, Lock<Match>>,
     users: UserStore,
     lobbies: LobbyList,
 }
@@ -81,8 +81,8 @@ impl Server {
     where
         F: Fn(&mut Vec<Player>) -> ServerResult<Response>,
     {
-        match self.matches.get(&id) {
-            Some(ref mut m) => cb(&mut m.lock().await.players),
+        match self.matches.read().await.get(&id) {
+            Some(ref mut m) => cb(&mut m.write().await.players),
             None => Err(ServerErr::NoSuchMatch),
         }
     }