Merge pull request #96 from Relayz-io/silvestr/issue-95-add-bandwidth-struct

Add a separate struct that holds a bandwidth information

common-api/Cargo.toml

@@ -29,3 +29,4 @@ x25519-dalek = { version = "1", features = ["serde"] }
 [dev-dependencies]
 rand = "0.8.5"
 rand_chacha = "0.3"
+serde_json = "1"

common-api/src/api.rs

@@ -1,4 +1,5 @@
 use crate::crypto::prelude::*;
+use borsh::{BorshDeserialize, BorshSerialize};
 use near_account_id::AccountId;
 use serde::{Deserialize, Serialize};
 use std::{collections::HashSet, time::Duration};
@@ -27,9 +28,46 @@ pub struct ParticipantInfo {
     pub account_id: AccountId,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
+pub struct Bandwidth {
+    pub speed: u32,
+    pub units: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 pub struct NodeInfo {
     pub region: String,
-    pub bandwidth: String,
+    pub bandwidth: Bandwidth,
     pub account_id: AccountId,
 }
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+    use std::str::FromStr;
+
+    #[test]
+    fn node_info_json() {
+        let s1 = serde_json::to_value(&NodeInfo {
+            account_id: AccountId::from_str("account.testnet").unwrap(),
+            bandwidth: Bandwidth {
+                speed: 100,
+                units: "mbps".to_owned(),
+            },
+            region: "us".to_owned(),
+        })
+        .unwrap();
+
+        let s2 = serde_json::json!({
+            "account_id": "account.testnet",
+            "region": "us",
+            "bandwidth": {
+                "speed": 100,
+                "units": "mbps"
+            }
+        });
+
+        assert_eq!(s1, s2);
+    }
+}