fix: topology for cpu

Author: will-break-it

topology-checker/src/analysis/basic.rs

@@ -279,15 +279,13 @@ mod tests {
             Producer {
                 latency_ms: 10.0,
                 bandwidth_bytes_per_second: None,
-                cpu_core_count: None,
             },
         );
         node1_producers.insert(
             "node3".to_string(),
             Producer {
                 latency_ms: 20.0,
                 bandwidth_bytes_per_second: None,
-                cpu_core_count: None,
             },
         );
 
@@ -297,7 +295,6 @@ mod tests {
             Producer {
                 latency_ms: 5.0,
                 bandwidth_bytes_per_second: None,
-                cpu_core_count: None,
             },
         );
 
@@ -307,7 +304,6 @@ mod tests {
             Producer {
                 latency_ms: 15.0,
                 bandwidth_bytes_per_second: None,
-                cpu_core_count: None,
             },
         );
 
@@ -319,6 +315,7 @@ mod tests {
                 },
                 stake: 100,
                 producers: node1_producers,
+                cpu_core_count: Some(8),
             },
         );
 
@@ -330,6 +327,7 @@ mod tests {
                 },
                 stake: 0,
                 producers: node2_producers,
+                cpu_core_count: Some(4),
             },
         );
 
@@ -341,6 +339,7 @@ mod tests {
                 },
                 stake: 200,
                 producers: node3_producers,
+                cpu_core_count: Some(16),
             },
         );
 
@@ -352,6 +351,7 @@ mod tests {
                 },
                 stake: 0,
                 producers: IndexMap::new(),
+                cpu_core_count: Some(4),
             },
         );
 

topology-checker/src/models/mod.rs

@@ -30,10 +30,6 @@ pub struct Producer {
     #[serde(default)]
     #[allow(dead_code)]
     pub bandwidth_bytes_per_second: Option<u64>,
-    #[serde(rename = "cpu-core-count")]
-    #[serde(default)]
-    #[allow(dead_code)]
-    pub cpu_core_count: Option<u64>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -44,6 +40,9 @@ pub struct Node {
     pub producers: IndexMap<String, Producer>,
     #[serde(default)]
     pub stake: u64,
+    #[serde(rename = "cpu-core-count")]
+    #[serde(default)]
+    pub cpu_core_count: Option<u32>,
 }
 
 #[derive(Debug, Deserialize)]