refactor for better testing & clippy conform;

fix: allow to set players' jokers to zero

Author: Flix

src/datahandler.rs

@@ -24,7 +24,7 @@ impl DataHandler
     {
         let (worker, sender) = DataWorker::new();
         worker.spawn_worker();
-        DataHandler { sender: sender }
+        DataHandler { sender }
     }
 
     /// Create a player in the database
@@ -83,3 +83,10 @@ impl DataHandler
         result_receiver.await.map_err(|_err| "db receive data access result error (dropped channel)")
     }
 }
+
+impl Default for DataHandler
+{
+    fn default() -> Self {
+        DataHandler::new()
+    }
+}

src/datahandler/database.rs

@@ -24,7 +24,7 @@ impl DataBase
     {
         //be sure UUID is REALLY unique
         let mut uuid = String::from("");
-        while uuid == "" || self.players.contains_key(&uuid)
+        while uuid.is_empty() || self.players.contains_key(&uuid)
         {
             uuid = Uuid::new_v4().to_simple().to_string();
         }
@@ -58,7 +58,7 @@ impl DataBase
     {
         //be sure UUID is REALLY unique
         let mut uuid = String::from("");
-        while uuid == "" || self.lobbies.contains_key(&uuid)
+        while uuid.is_empty() || self.lobbies.contains_key(&uuid)
         {
             uuid = Uuid::new_v4().to_simple().to_string();
         }

src/datahandler/dataworker.rs

@@ -33,7 +33,7 @@ impl DataWorker
     pub fn new() -> (Self, mpsc::Sender<DataAccess>)
     {
         let (sender, receiver) = mpsc::channel(DATA_ACCESS_CAPACITY);
-        let worker = DataWorker { db: DataBase::new(), receiver: receiver };
+        let worker = DataWorker { db: DataBase::new(), receiver };
         (worker, sender)
     }
 

src/game.rs

@@ -77,14 +77,16 @@ impl Gameshow
 
     async fn generate_lobby_update(&self)
     {
+        let lobby_open = self.is_open().await;
+        let question_set = self.get_question_set().await;
         //send LobbySettingsUpdate to clients
         let event = EventType::LobbySettingsUpdate(EventLobbySettingsUpdate {
-            open: self.is_open().await,
+            open: lobby_open,
             initial_money: self.get_initial_money(),
             initial_jokers: self.get_initial_jokers(),
             normal_q_money: self.get_normal_q_money(),
             estimation_q_money: self.get_estimation_q_money(),
-            question_set: self.get_question_set().await,
+            question_set,
         });
         self.game_events.write().await.add(event);
     }
@@ -305,7 +307,7 @@ impl Gameshow
             });
             self.game_events.write().await.add(event);
             //return name
-            return Some(name);
+            Some(name)
         }
         else if self.is_open().await
         { //others need to have unique name (from others and from admin)
@@ -342,11 +344,11 @@ impl Gameshow
             });
             self.game_events.write().await.add(event);
             //return name
-            return Some(name);
+            Some(name)
         }
         else
         {
-            return None;
+            None
         }
     }
 
@@ -535,7 +537,7 @@ impl Gameshow
                 { //set player's vs_player
                     player.vs_player = String::from(vs_player);
                 }
-                else if player.vs_player == ""
+                else if player.vs_player.is_empty()
                 { //check if player has selected
                     all_selected = false;
                 }
@@ -670,18 +672,7 @@ impl Gameshow
         let mut repeat = true;
         while repeat
         {
-            repeat = !state::state_transition(
-                &self.lobby_state,
-                &self.questions,
-                &self.current_question,
-                &self.player_data,
-                &self.game_events,
-                &self.open,
-                &self.param_initial_money,
-                &self.param_initial_jokers,
-                &self.param_normal_q_money,
-                &self.param_estimation_q_money
-            ).await;
+            repeat = !state::state_transition(&self).await;
         }
     }
 }
@@ -714,7 +705,7 @@ pub struct PublicPlayerData
     answer: usize,
 }
 
-fn make_public_player_data(players: &Vec<PlayerData>) -> Vec<PublicPlayerData>
+fn make_public_player_data(players: &[PlayerData]) -> Vec<PublicPlayerData>
 {
     players.iter().map(|player| {
         PublicPlayerData {
@@ -742,5 +733,5 @@ fn generate_random_string(length: usize) -> String
     {
         rnd_string.push(choose_from.choose(&mut rng).unwrap().to_owned());
     }
-    return rnd_string;
+    rnd_string
 }

src/game/events.rs

@@ -33,16 +33,16 @@ impl EventManager
     {
         let last = self.events.last();
         let mut id = 0;
-        if last.is_some()
+        if let Some(last) = last
         {
-            id = last.unwrap().id + 1;
+            id = last.id + 1;
         }
         let event_type = format!("{}", event);
 
         let new_event = Event {
-            id: id,
+            id,
             event_name: event_type,
-            event: event,
+            event,
         };
         self.events.push(new_event.clone());
         self.event_sender.send(new_event).ok();

src/game/questions.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use serde::{Serialize, Deserialize};
 
 
-const QUESTIONS_FOLDER:&'static str = "./questions";
+const QUESTIONS_FOLDER: &str = "./questions";
 
 
 //different gameshow question types
@@ -48,10 +48,10 @@ pub fn find_question_files() -> std::io::Result<Vec<(String, PathBuf)>>
         {
             let file_name = path.file_stem();
             let file_type = path.extension();
-            if file_type.is_some()
+            if let Some(file_type) = file_type
             {
                 let file_name = file_name.unwrap().to_string_lossy().into_owned();
-                let file_type = file_type.unwrap().to_string_lossy().to_lowercase();
+                let file_type = file_type.to_string_lossy().to_lowercase();
                 if file_type == "json" && file_name != "questions-example"
                 {
                     list.push((file_name, path));