chore: use shared api types to deserialize

Author: yHSJ

crates/rpc/src/bin/metric_exporter/routes/game/add_player.rs

@@ -1,22 +1,17 @@
-use hydra_control_plane_rpc::model::cluster::{ConnectionInfo, NodeClient};
+use hydra_control_plane_rpc::model::cluster::{
+    shared::AddPlayerLocalResponse, ConnectionInfo, NodeClient,
+};
 use pallas::ledger::addresses::Address;
 use rocket::{get, http::Status, serde::json::Json, State};
-use serde::Serialize;
 use tracing::error;
 
 use crate::LocalState;
 
-#[derive(Serialize)]
-pub struct AddPlayerResponse {
-    player_state: String,
-    admin_pkh: String,
-}
-
 #[get("/game/add_player?<address>")]
 pub async fn add_player(
     address: &str,
     state: &State<LocalState>,
-) -> Result<Json<AddPlayerResponse>, Status> {
+) -> Result<Json<AddPlayerLocalResponse>, Status> {
     let pkh = match Address::from_bech32(address).map_err(|_| Status::BadRequest)? {
         Address::Shelley(shelley) => Ok(*shelley.payment().as_hash()),
         _ => Err(Status::BadRequest),
@@ -34,7 +29,7 @@ pub async fn add_player(
         .inspect_err(|err| error!("error adding player: {}", err))
         .map_err(|_| Status::InternalServerError)?;
 
-    Ok(Json(AddPlayerResponse {
+    Ok(Json(AddPlayerLocalResponse {
         player_state: format!("{}#1", hex::encode(tx_hash)),
         admin_pkh: hex::encode(client.tx_builder.admin_pkh),
     }))

crates/rpc/src/bin/metric_exporter/routes/game/new_game.rs

@@ -1,21 +1,19 @@
 use anyhow::{anyhow, Context};
-use hydra_control_plane_rpc::model::cluster::{ConnectionInfo, NodeClient};
+use hydra_control_plane_rpc::model::cluster::{
+    shared::NewGameLocalResponse, ConnectionInfo, NodeClient,
+};
 use pallas::ledger::addresses::Address;
 use rocket::{get, serde::json::Json, State};
 use rocket_errors::anyhow::Result;
-use serde::Serialize;
 use tracing::info;
 
 use crate::LocalState;
 
-#[derive(Serialize)]
-pub struct NewGameResponse {
-    player_state: String,
-    admin_pkh: String,
-}
-
 #[get("/game/new_game?<address>")]
-pub async fn new_game(address: &str, state: &State<LocalState>) -> Result<Json<NewGameResponse>> {
+pub async fn new_game(
+    address: &str,
+    state: &State<LocalState>,
+) -> Result<Json<NewGameLocalResponse>> {
     info!("Creating a new game for {}", address);
 
     let pkh = match Address::from_bech32(address).context("invalid address")? {
@@ -34,7 +32,7 @@ pub async fn new_game(address: &str, state: &State<LocalState>) -> Result<Json<N
         .await
         .context("error creating new game")?;
 
-    Ok(Json(NewGameResponse {
+    Ok(Json(NewGameLocalResponse {
         player_state: format!("{}#1", hex::encode(tx_hash)),
         admin_pkh: hex::encode(client.tx_builder.admin_pkh),
     }))

crates/rpc/src/model/cluster/mod.rs

@@ -12,6 +12,7 @@ use serde::Deserialize;
 
 mod crd;
 mod node;
+pub mod shared;
 
 pub use crd::*;
 pub use node::*;
@@ -68,7 +69,11 @@ impl ClusterState {
         let watcher_handle = tokio::spawn(async move {
             let infinite_watch = rf.applied_objects().for_each(|node| {
                 if let Ok(node) = node {
-                    if node.status.as_ref().is_some_and(|n| n.game_state != "Waiting") {
+                    if node
+                        .status
+                        .as_ref()
+                        .is_some_and(|n| n.game_state != "Waiting")
+                    {
                         let id = node.metadata.name.as_ref().unwrap();
                         let mut claims = claims.lock().unwrap();
                         if claims.remove(id).is_some() {
@@ -93,23 +98,36 @@ impl ClusterState {
 
     pub fn select_node_for_new_game(&self) -> anyhow::Result<Arc<HydraDoomNode>> {
         let mut claimed = self.recently_claimed.lock().unwrap();
-        let node = self.store
+        let node = self
+            .store
             .state()
             .iter()
             .filter(|n| {
                 let id = n.metadata.name.as_ref().unwrap();
                 let recently_claimed = claimed.get(id).unwrap_or(&false);
-                info!("checking node {}, recently claimed: {}, status: {}", id, recently_claimed, n.status.as_ref().map(|s| s.game_state.as_str()).unwrap_or("unknown"));
+                info!(
+                    "checking node {}, recently claimed: {}, status: {}",
+                    id,
+                    recently_claimed,
+                    n.status
+                        .as_ref()
+                        .map(|s| s.game_state.as_str())
+                        .unwrap_or("unknown")
+                );
                 if let Some(status) = n.status.as_ref() {
-                    !recently_claimed && status.node_state == "HeadIsOpen" && status.game_state == "Waiting"
+                    !recently_claimed
+                        && status.node_state == "HeadIsOpen"
+                        && status.game_state == "Waiting"
                 } else {
                     false
                 }
             })
             .max_by_key(|n| n.metadata.creation_timestamp.clone())
             .cloned()
             .ok_or(anyhow::anyhow!("no available nodes found"))?;
-        claimed.entry(node.metadata.name.clone().expect("node without a name")).or_insert(true);
+        claimed
+            .entry(node.metadata.name.clone().expect("node without a name"))
+            .or_insert(true);
         Ok(node)
     }
 

crates/rpc/src/model/cluster/shared/mod.rs

@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct NewGameLocalResponse {
+    pub player_state: String,
+    pub admin_pkh: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct AddPlayerLocalResponse {
+    pub player_state: String,
+    pub admin_pkh: String,
+}

crates/rpc/src/routes/add_player.rs

@@ -1,9 +1,7 @@
-use std::collections::HashMap;
-
 use rocket::{get, http::Status, serde::json::Json, State};
 use serde::Serialize;
 
-use crate::model::cluster::ClusterState;
+use crate::model::cluster::{shared::AddPlayerLocalResponse, ClusterState};
 
 #[derive(Serialize)]
 pub struct AddPlayerResponse {
@@ -35,19 +33,13 @@ pub async fn add_player(
     let response = reqwest::get(url).await.map_err(|_| Status::BadGateway)?;
 
     let body = response
-        .json::<HashMap<String, String>>()
+        .json::<AddPlayerLocalResponse>()
         .await
         .map_err(|_| Status::InternalServerError)?;
 
     Ok(Json(AddPlayerResponse {
         ip: external_url,
-        player_state: body
-            .get("player_state")
-            .ok_or(Status::InternalServerError)?
-            .to_owned(),
-        admin_pkh: body
-            .get("admin_pkh")
-            .ok_or(Status::InternalServerError)?
-            .to_owned(),
+        player_state: body.player_state,
+        admin_pkh: body.admin_pkh,
     }))
 }

crates/rpc/src/routes/new_game.rs

@@ -1,12 +1,10 @@
-use std::collections::HashMap;
-
 use anyhow::Context;
 use rocket::{get, serde::json::Json, State};
 use rocket_errors::anyhow::Result;
 use serde::Serialize;
 use tracing::info;
 
-use crate::model::cluster::ClusterState;
+use crate::model::cluster::{shared::NewGameLocalResponse, ClusterState};
 
 #[derive(Serialize)]
 pub struct NewGameResponse {
@@ -41,21 +39,16 @@ pub async fn new_game(address: &str, state: &State<ClusterState>) -> Result<Json
     let response = reqwest::get(url)
         .await
         .context("failed to hit new_game metrics server endpoint")?;
+
     let body = response
-        .json::<HashMap<String, String>>()
+        .json::<NewGameLocalResponse>()
         .await
         .context("http error")?;
 
     Ok(Json(NewGameResponse {
         game_id: node_id,
         ip: external_url,
-        player_state: body
-            .get("player_state")
-            .context("missing player_state in response")?
-            .to_owned(),
-        admin_pkh: body
-            .get("admin_pkh")
-            .context("missing admin_pkh in response")?
-            .to_owned(),
+        player_state: body.player_state,
+        admin_pkh: body.admin_pkh,
     }))
 }