hedgewars: comparison gameServer2/src/server/handlers/common.rs

equal deleted inserted replaced

-:1ee192f13456
+:ba5211dddb21
 use protocol::messages::{
 HWProtocolMessage::{self, Rnd}, HWServerMessage::{self, ChatMsg},
 };
-use rand::{self, Rng};
+use rand::{self, Rng, thread_rng};
-use server::{actions::Action, room::HWRoom, server::HWServer};
+use server::{actions::Action, server::HWServer};
-pub fn rnd_action(options: Vec<String>, room: Option<&mut HWRoom>) -> Vec<Action> {
+pub fn rnd_reply(options: &Vec<String>) -> HWServerMessage {
-if let Some(room) = room {
+let mut rng = thread_rng();
-let msg = rnd_reply(options);
+let reply = if options.is_empty() {
-vec![msg.send_all().in_room(room.id).action()]
+(*rng.choose(&["heads", "tails"]).unwrap()).to_owned()
 } else {
-Vec::new()
+rng.choose(&options).unwrap().clone()
-}
+};
-}
-fn rnd_reply(options: Vec<String>) -> HWServerMessage {
+ChatMsg {
-let options = if options.is_empty() {
-vec!["heads".to_owned(), "tails".to_owned()]
-} else {
-options
-};
-let reply = rand::thread_rng().choose(&options).unwrap();
-let msg = ChatMsg {
 nick: "[random]".to_owned(),
 msg: reply.clone(),
-};
+}
-msg
 }
 #[cfg(test)]
 mod tests {
 use super::*;
 }
 fn run_handle_test(opts: Vec<String>) {
 let opts2 = opts.clone();
 for opt in opts {
-while reply2string(rnd_reply(opts2.clone())) != opt {}
+while reply2string(rnd_reply(&opts2)) != opt {}
 }
 }
 /// This test terminates almost surely.
 #[test]
 let mut ones = 0;
 let mut tries = 0;
 while tries < 1000 || ((ones as f64 / tries as f64) - lim).abs() >= eps {
 tries += 1;
-if reply2string(rnd_reply(opts.clone())) == 1.to_string() {
+if reply2string(rnd_reply(&opts)) == 1.to_string() {
 ones += 1;
 }
 }
 }
 }

changeset 13521	ba5211dddb21
parent 13446	dd2e51f7303d
child 13524	5359ff75da3a