Impl game event type build

secert-hitler/src/controller/gamemaster/gameevent.rs

@@ -44,6 +44,23 @@ impl GameEventType {
          _ => return GameEventType::Null,
       }
    }
+
+   fn build(&self) -> GameEvent {
+      let mut d = json::object!{
+         GameEventType: format!("{:?}", self),
+         sources: [],
+         targets: [],
+         params: [],
+      };
+      match self {
+         _ => {},
+      };
+      let s = d.dump();
+      let d = json::object!{
+         "body": s,
+      };
+      GameEvent::new(d.dump())
+   }
 }
 
 impl GameEvent {
@@ -136,6 +153,30 @@ mod tests {
       assert!(GameEventType::from_string("GameStop".to_string()) == GameEventType::GameStop);
    }
 
+   #[test]
+   fn type_build() {
+      let cases = vec![
+         GameEventType::Null,
+         GameEventType::GameStart,
+         GameEventType::RoleSet,
+         GameEventType::ElectionPend,
+         GameEventType::ElectionSet,
+         GameEventType::VoteSet,
+         GameEventType::CardPend,
+         GameEventType::CardPick,
+         GameEventType::PolicySet,
+         GameEventType::SpecialInspect,
+         GameEventType::SpecialSelect,
+         GameEventType::SpecialKill,
+         GameEventType::SpecialPeek,
+         GameEventType::GameStop,
+      ];
+      for c in &cases {
+         let gameevent = c.build();
+         assert!(*c == gameevent.mode(), "{:?}.build() yielded {:?}", c, gameevent);
+      }
+   }
+
    #[test]
    fn sources() {
       let ge = GameEvent::new(r#"{"body": "{\"sources\": [\"a\", \"b\"]}"}"#.to_string());

secert-hitler/src/controller/gamemaster/gamemaster.rs

@@ -2,8 +2,10 @@ use super::super::super::model::state::room::Room;
 use super::lobby::Lobby;
 use super::gameevent::GameEvent;
 use super::gameevent::GameEventType;
+
 use std::thread;
 use std::time;
+use log::{info, warn, error, debug};
 
 pub struct GameMaster {
    room: Box<dyn Room>,
@@ -11,15 +13,21 @@ pub struct GameMaster {
 }
 
 impl GameMaster {
-   fn new(room: Box<dyn Room>) -> GameMaster {
+   pub fn new(room: Box<dyn Room>) -> GameMaster {
+      info!("created for room {}", room.room_id());
       GameMaster{
          room: room,
          lobby: Lobby::new(),
       }
    }
 
-   fn run(&mut self) -> Result<String, String> {
-      self.run_lobby()?;
+   pub fn run(&mut self) -> Result<String, String> {
+      loop {
+         let r = self.run_lobby();
+         if r.is_ok() {
+            break
+         }
+      }
       self.run_game_setup()?;
       self.run_game()
    }
@@ -28,10 +36,8 @@ impl GameMaster {
       while !self.lobby.locked {
          let rollback = self.room.since();
          let events = self.room.sync();
-         println!("top of loop: since={:?}, events={:?}", self.room.since(), events);
          for e in &events {
             let ge = GameEvent::new(e.body.clone());
-            println!("   ge.mode = {:?}", ge.mode());
             if ge.mode() == GameEventType::GameStart {
                self.room.rollback(e.since.clone());
                self.lobby.lock();
@@ -60,6 +66,13 @@ mod tests {
    use super::super::super::super::model::state::mockrooms::MockRooms;
    use super::super::super::super::model::state::rooms::Rooms;
 
+   fn init() {
+      use env_logger::Env;
+      let _ = env_logger::builder()
+         .is_test(true)
+         .try_init();
+   }
+
    #[test]
    fn new_mockroom() {
       let _ = GameMaster::new(Box::new(MockRoom::create()));
@@ -85,6 +98,7 @@ mod tests {
 
    #[test]
    fn run_lobby() {
+      init();
       let mut mrs = MockRooms::new();
       let r1 = mrs.create();
       let room_id = r1.room_id();