Fix hashrate is returned as gh/s instead of h/s

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

src/response.rs

@@ -57,11 +57,11 @@ pub struct SystemInfo {
     /// Current hashrate in H/s
     #[serde(rename = "hashRate")]
     #[serde(deserialize_with = "deserialize_hashrate")]
-    pub hashrate: u64,
+    pub hashrate_hs: u64,
     /// Expected hashrate in H/s
     #[serde(rename = "expectedHashrate")]
     #[serde(deserialize_with = "deserialize_hashrate")]
-    pub expected_hashrate: u64,
+    pub expected_hashrate_hs: u64,
     /// Best difficulty achieved
     #[serde(rename = "bestDiff")]
     #[serde(deserialize_with = "deserialize_difficulty")]
@@ -171,26 +171,25 @@ impl Visitor<'_> for HashrateVisitor {
     where
         E: de::Error,
     {
-        if value < 0 { Ok(0) } else { Ok(value as u64) }
+        if value < 0 {
+            return Ok(0);
+        }
+
+        convert_ghs_to_hs(value as f64)
     }
 
-    fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E> {
-        Ok(value)
+    fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        convert_ghs_to_hs(value as f64)
     }
 
     fn visit_f64<E>(self, value: f64) -> Result<Self::Value, E>
     where
         E: de::Error,
     {
-        if !value.is_finite() || value < 0.0 {
-            return Ok(0);
-        }
-
-        if value > u64::MAX as f64 {
-            return Err(E::custom("hashrate is too large"));
-        }
-
-        Ok(value as u64)
+        convert_ghs_to_hs(value)
     }
 
     fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
@@ -228,7 +227,24 @@ where
         .parse()
         .map_err(|_| E::custom("hashrate string is not numeric"))?;
 
-    HashrateVisitor.visit_f64(parsed)
+    convert_ghs_to_hs(parsed)
+}
+
+fn convert_ghs_to_hs<E>(value: f64) -> Result<u64, E>
+where
+    E: de::Error,
+{
+    if !value.is_finite() || value < 0.0 {
+        return Ok(0);
+    }
+
+    let hashrate_hs: f64 = value * 1_000_000_000.0;
+
+    if hashrate_hs > u64::MAX as f64 {
+        return Err(E::custom("hashrate is too large"));
+    }
+
+    Ok(hashrate_hs as u64)
 }
 
 struct DifficultyVisitor;
@@ -430,8 +446,8 @@ mod tests {
                 fallback_stratum_port: 3333,
                 fallback_stratum_user: String::from("1PKN98VN2z5gwSGZvGKS2bj8aADZBkyhkZ"),
                 stratum_latency: Some(22.331),
-                hashrate: 1184,
-                expected_hashrate: 1071,
+                hashrate_hs: 1_184_809_322_463,
+                expected_hashrate_hs: 1_071_000_000_000,
                 best_diff: Some(2.03e9 as u64),
                 best_session_diff: Some(138.17e6 as u64),
                 pool_difficulty: 1000,
@@ -515,8 +531,8 @@ mod tests {
 }"#;
 
         let info: SystemInfo = serde_json::from_str(json).unwrap();
-        assert_eq!(info.hashrate, 1072);
-        assert_eq!(info.expected_hashrate, 1071);
+        assert_eq!(info.hashrate_hs, 1_072_240_722_700);
+        assert_eq!(info.expected_hashrate_hs, 1_071_000_000_000);
         assert_eq!(info.best_diff, Some(49_224_525));
         assert_eq!(info.best_session_diff, Some(2_038_368));
         assert!(info.is_using_fallback_stratum);