Addressed some of the PR issues

piggottdev · piggottdev · commit 6353cca93e1e · 2024-10-09T14:30:06.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,8 +45,7 @@ members = [
     "example_apps/stocks_simulated",
     "example_apps/kafka_ingress_connector",
     "example_apps/kafka_egress_connector", 
-    "example_apps/game",
-    "example_apps/game/game-model"
+    "example_apps/game"
 ]
 
 [workspace.package]
@@ -184,4 +183,5 @@ http-body-util = "0.1.2"
 hyper-util = "0.1.5"
 rdkafka = "0.36"
 apache-avro = "0.17.0"
-time = "0.3.36"
+time = "0.3.36"
+rand_distr = "0.4.3"
diff --git a/example_apps/game/Cargo.toml b/example_apps/game/Cargo.toml
@@ -15,4 +15,5 @@ clap = { workspace = true, features = ["derive"]}
 axum = { version = "0.6.20", features = ["tokio", "http1"]}
 tokio-stream = { workspace = true, features = ["io-util"]}
 tokio-util = { workspace = true, features = ["io"]}
-game-model = { path = "game-model" }
+rand = { workspace = true }
+rand_distr = { workspace = true }
diff --git a/example_apps/game/game-model/Cargo.toml b/example_apps/game/game-model/Cargo.toml
diff --git a/example_apps/game/game-model/src/lib.rs b/example_apps/game/game-model/src/lib.rs
diff --git a/example_apps/game/src/agents/game.rs b/example_apps/game/src/agents/game.rs
@@ -14,9 +14,9 @@
 
 use std::{cell::RefCell, collections::VecDeque, time::Duration};
 
-use game_model::game::Game;
+use crate::generator::game::Game;
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerActionExt},
     lanes::{CommandLane, MapLane, ValueLane},
     lifecycle, projections, AgentLaneModel,
@@ -126,8 +126,8 @@ fn generate_match(
     let round = game.generate_round();
     context.send_command(
         None,
-        format!("/match/{id}", id = round.id),
-        "publish".to_string(),
+        format!("/match/{id}", id = round.id).as_str(),
+        "publish",
         round,
     )
 }
diff --git a/example_apps/game/src/agents/leaderboard.rs b/example_apps/game/src/agents/leaderboard.rs
@@ -14,10 +14,10 @@
 
 use std::{cell::RefCell, collections::HashMap, time::Duration};
 
-use game_model::config;
+use crate::generator::config;
 use swimos::{
     agent::{
-        agent_lifecycle::utility::HandlerContext,
+        agent_lifecycle::HandlerContext,
         event_handler::{EventHandler, HandlerAction, HandlerActionExt},
         lanes::{CommandLane, DemandLane, JoinValueLane, ValueLane},
         lifecycle, projections, AgentLaneModel,
diff --git a/example_apps/game/src/agents/model/leaderboard.rs b/example_apps/game/src/agents/model/leaderboard.rs
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{cmp::Ordering, sync::Arc};
+use std::cmp::Ordering;
 
 use super::stats::PlayerTotals;
 
-type Comparator = Arc<dyn Fn(&PlayerTotals, &PlayerTotals) -> Ordering + Sync + Send>;
+type Comparator = fn(&PlayerTotals, &PlayerTotals) -> Ordering;
 
 #[derive(Clone)]
 pub struct Leaderboard {
@@ -31,30 +31,30 @@ impl Leaderboard {
     pub fn kill_count(capacity: usize) -> Self {
         Leaderboard::new(
             capacity,
-            Arc::new(|p1, p2| p1.total_kills.cmp(&p2.total_kills)),
+            |p1, p2| p1.total_kills.cmp(&p2.total_kills),
         )
     }
 
     pub fn death_count(capacity: usize) -> Self {
         Leaderboard::new(
             capacity,
-            Arc::new(|p1, p2| p1.total_deaths.cmp(&p2.total_deaths)),
+            |p1, p2| p1.total_deaths.cmp(&p2.total_deaths),
         )
     }
 
     pub fn kd_ratio(capacity: usize) -> Self {
         Leaderboard::new(
             capacity,
-            Arc::new(|p1, p2| {
+            |p1, p2| {
                 p1.kd_ratio
                     .partial_cmp(&p2.kd_ratio)
                     .unwrap_or_else(|| p1.total_kills.cmp(&p2.total_kills))
-            }),
+            },
         )
     }
 
     pub fn xp(capacity: usize) -> Self {
-        Leaderboard::new(capacity, Arc::new(|p1, p2| p1.total_xp.cmp(&p2.total_xp)))
+        Leaderboard::new(capacity, |p1, p2| p1.total_xp.cmp(&p2.total_xp))
     }
 
     pub fn new(capacity: usize, f: Comparator) -> Self {
@@ -93,7 +93,7 @@ impl Leaderboard {
             return false;
         };
 
-        let mover_stats = self.items.get(index).unwrap();
+        let mover_stats = &self.items[index];
         if (self.comparator)(mover_stats, self.items.get(index + 1).unwrap()) != Ordering::Less {
             return false;
         }
@@ -108,7 +108,7 @@ impl Leaderboard {
             return false;
         };
 
-        let mover_stats = self.items.get(index).unwrap();
+        let mover_stats = &self.items[index];
         if (self.comparator)(mover_stats, self.items.get(index - 1).unwrap()) != Ordering::Greater {
             return false;
         };
diff --git a/example_apps/game/src/agents/model/stats.rs b/example_apps/game/src/agents/model/stats.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use game_model::round::{PlayerRound, Round};
+use crate::generator::round::{PlayerRound, Round};
 use std::collections::HashMap;
 use swimos_form::Form;
 
@@ -35,8 +35,8 @@ pub struct MatchSummary {
     pub player_stats: HashMap<usize, MatchStats>,
 }
 
-impl MatchSummary {
-    pub fn from_round(round: Round) -> MatchSummary {
+impl From<Round> for MatchSummary {
+    fn from(round: Round) -> MatchSummary {
         MatchSummary {
             match_id: round.id,
             duration: round.duration,
diff --git a/example_apps/game/src/agents/player.rs b/example_apps/game/src/agents/player.rs
@@ -14,9 +14,9 @@
 
 use std::{cell::RefCell, collections::VecDeque};
 
-use game_model::gamertag;
+use crate::generator::gamertag;
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerActionExt},
     lanes::{CommandLane, MapLane, ValueLane},
     lifecycle, projections, AgentLaneModel,
@@ -109,7 +109,7 @@ impl PlayerLifecycle {
                     }),
             )
             .followed_by(context.get_agent_uri().and_then(move |uri| {
-                context.send_command(None, "/player".to_string(), "addPlayer".to_string(), uri)
+                context.send_command(None, "/player", "addPlayer", uri)
             }))
     }
 
diff --git a/example_apps/game/src/agents/round.rs b/example_apps/game/src/agents/round.rs
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use game_model::round::Round;
+use crate::generator::round::Round;
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerActionExt, Sequentially},
     lanes::{CommandLane, ValueLane},
     lifecycle, projections, AgentLaneModel,
@@ -51,7 +51,7 @@ impl MatchLifecycle {
                 info!(id = round.id, "New match published.");
                 round
             })
-            .map(MatchSummary::from_round)
+            .map(Round::into)
             .and_then(move |summary: MatchSummary| {
                 context
                     .set_value(MatchAgent::STATS, Some(summary.clone()))
@@ -81,14 +81,14 @@ fn forward_match_summary(
     let forward_to_players = match_summary
         .player_stats
         .keys()
-        .map(|id| command_match_summary(context, match_summary.clone(), format!("/player/{id}")))
+        .map(|id| command_match_summary(context, match_summary.clone(), format!("/player/{id}").as_str()))
         .collect::<Vec<_>>();
     let forward_to_teams = match_summary
         .team_stats
         .keys()
-        .map(|name| command_match_summary(context, match_summary.clone(), format!("/team/{name}")))
+        .map(|name| command_match_summary(context, match_summary.clone(), format!("/team/{name}").as_str()))
         .collect::<Vec<_>>();
-    let forward_to_game = command_match_summary(context, match_summary, "/match".to_string());
+    let forward_to_game = command_match_summary(context, match_summary, "/match");
     forward_to_game
         .followed_by(Sequentially::new(forward_to_players))
         .followed_by(Sequentially::new(forward_to_teams))
@@ -97,7 +97,7 @@ fn forward_match_summary(
 fn command_match_summary(
     context: HandlerContext<MatchAgent>,
     match_summary: MatchSummary,
-    node_uri: String,
+    node_uri: &str,
 ) -> impl EventHandler<MatchAgent> {
-    context.send_command(None, node_uri, "addMatch".to_string(), match_summary)
+    context.send_command(None, node_uri, "addMatch", match_summary)
 }
diff --git a/example_apps/game/src/agents/team.rs b/example_apps/game/src/agents/team.rs
@@ -14,7 +14,7 @@
 
 use swimos::{
     agent::{
-        agent_lifecycle::utility::HandlerContext,
+        agent_lifecycle::HandlerContext,
         event_handler::{EventHandler, HandlerActionExt},
         lanes::{CommandLane, ValueLane},
         lifecycle, projections, AgentLaneModel,
diff --git a/example_apps/game/src/generator/battle.rs b/example_apps/game/src/generator/battle.rs
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 
-use rand::Rng;
+use rand::{seq::SliceRandom, Rng};
 
-use crate::{config, player::Player, round::PlayerRound};
+use crate::generator::{config, player::Player, round::PlayerRound};
 
 pub struct Battle<'a> {
     team1: Team<'a>,
@@ -73,7 +73,7 @@ struct Team<'a> {
 impl<'a> Team<'a> {
 
     fn new(name: &'static str, players: Vec<&'a mut Player>) -> Team<'a> {
-        let alive: Vec<PlayerBattleContext> = players.into_iter().map(|player| PlayerBattleContext::new(player)).collect();
+        let alive: Vec<PlayerBattleContext> = players.into_iter().map(|player| PlayerBattleContext::from(player)).collect();
         let dead = Vec::with_capacity(alive.len());
         Team { name, alive, dead }
     }
@@ -90,14 +90,15 @@ impl<'a> Team<'a> {
         self.dead.push(player);
     }
 
-    fn take_random_alive(&'_ mut self) -> PlayerBattleContext<'a> {
+    fn take_random_alive(&mut self) -> PlayerBattleContext<'a> {
         self.alive.swap_remove(rand::thread_rng().gen_range(0..self.alive.len()))
     }
 
     fn assign_random_assist(&mut self) {
-        let alive_count = self.alive.len();
-        if alive_count > 0 {
-            self.alive.get_mut(rand::thread_rng().gen_range(0..alive_count)).unwrap().increment_assists();
+        let mut rng = rand::thread_rng();
+        let assister = self.alive.choose_mut(&mut rng);
+        if let Some(player) = assister {
+            player.increment_assists();
         }
     }
 
@@ -121,12 +122,16 @@ struct PlayerBattleContext<'a> {
     assists: usize,
 }
 
-impl<'a> PlayerBattleContext<'a> {
+impl<'a> From<&'a mut Player> for PlayerBattleContext<'a> {
 
-    fn new(player: &mut Player) -> PlayerBattleContext {
+    fn from(player: &'a mut Player) -> Self {
         PlayerBattleContext { player, kills: 0, assists: 0 }
     }
 
+} 
+
+impl<'a> PlayerBattleContext<'a> {
+
     fn increment_kills(&mut self) {
         self.kills += 1;
     }
@@ -178,7 +183,7 @@ mod tests {
         player.xp = 500;
 
         let result = {
-            let mut player_context = PlayerBattleContext::new(&mut player);
+            let mut player_context = PlayerBattleContext::from(&mut player);
 
             player_context.increment_kills();
             player_context.increment_assists();
diff --git a/example_apps/game/src/generator/config.rs b/example_apps/game/src/generator/config.rs
@@ -15,7 +15,7 @@
 use std::collections::HashSet;
 use rand::Rng;
 use rand_distr::{Beta, Binomial};
-use crate::player::Player;
+use crate::generator::player::Player;
 
 pub const MAX_MATCH_ID: usize = 250;
 
@@ -37,8 +37,6 @@ pub const XP_PER_ASSIST: usize = 50;
 
 pub const ASSIST_RATIO: f32 = 0.2;
 
-// TODO: Cache the ThreadRng and Distributions 
-
 pub fn generate_game_duration() -> u64 {
     rand::thread_rng().sample(Binomial::new(30, 0.5).unwrap()) * 60000 +
     rand::thread_rng().gen_range(0..60000)
@@ -92,4 +90,4 @@ pub fn generate_unique_player_ids(count: usize) -> HashSet<usize> {
 
 pub fn generate_player_id() -> usize {
     rand::thread_rng().gen_range(0..UNIVERSE_PLAYER_COUNT)
-}
+}
diff --git a/example_apps/game/src/generator/game.rs b/example_apps/game/src/generator/game.rs
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 
-use crate::{player::Player, round::Round};
-use crate::config;
+use crate::generator::{player::Player, round::Round};
+use crate::generator::config;
 
 
 #[derive(Debug, Default)]
diff --git a/example_apps/game/src/generator/gamertag.rs b/example_apps/game/src/generator/gamertag.rs
diff --git a/example_apps/game/src/generator/mod.rs b/example_apps/game/src/generator/mod.rs
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod battle;
 pub mod config;
+pub mod game;
 pub mod gamertag;
 pub mod player;
-pub mod battle;
 pub mod round;
-pub mod game;
diff --git a/example_apps/game/src/generator/player.rs b/example_apps/game/src/generator/player.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{config, gamertag};
+use crate::generator::{config, gamertag};
 
 #[derive(Debug)]
 pub struct Player {
diff --git a/example_apps/game/src/generator/round.rs b/example_apps/game/src/generator/round.rs
@@ -14,7 +14,7 @@
 
 use std::time::{SystemTime, UNIX_EPOCH};
 use swimos_form::Form;
-use crate::{battle::Battle, config, player::Player};
+use crate::{generator::battle::Battle, generator::config, generator::player::Player};
 
 #[derive(Debug, Clone, Form)]
 #[form(tag = "match", fields_convention = "camel")]
diff --git a/example_apps/game/src/lib.rs b/example_apps/game/src/lib.rs
diff --git a/example_apps/game/src/main.rs b/example_apps/game/src/main.rs
