fix hammer test, enforce default hr unit

UpstreamData · Jan 2, 2025 · 5236e02 · 5236e02
1 parent 9ee52f7
commit 5236e02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pyasic/miners/backends/hammer.py b/pyasic/miners/backends/hammer.py
@@ -229,7 +229,7 @@ async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
                         hashrate = boards[1].get(f"chain_rate{i}")
                         if hashrate:
                             hashboard.hashrate = self.algo.hashrate(
-                                rate=float(hashrate), unit=self.algo.unit.GH
+                                rate=float(hashrate), unit=self.algo.unit.MH
                             ).into(self.algo.unit.default)
 
                         chips = boards[1].get(f"chain_acn{i}")
@@ -358,7 +358,7 @@ async def _get_expected_hashrate(
             try:
                 expected_rate = rpc_stats["STATS"][1].get("total_rateideal")
                 if expected_rate is None:
-                    return self.sticker_hashrate
+                    return self.sticker_hashrate.into(self.algo.unit.default)
                 try:
                     rate_unit = rpc_stats["STATS"][1]["rate_unit"]
                 except KeyError:

diff --git a/tests/miners_tests/backends_tests/hammer_tests/version_2023_05_28.py b/tests/miners_tests/backends_tests/hammer_tests/version_2023_05_28.py
@@ -6,6 +6,7 @@
 
 from pyasic import APIError, MinerData
 from pyasic.data import Fan, HashBoard
+from pyasic.device.algorithm.hashrate.unit.scrypt import ScryptUnit
 from pyasic.miners.hammer import HammerD10
 
 POOLS = [
@@ -398,6 +399,6 @@ async def test_all_data_gathering(self, mock_send_bytes):
             self.assertEqual(result.api_ver, "3.1")
             self.assertEqual(result.fw_ver, "2023-05-28 17-20-35 CST")
             self.assertEqual(result.hostname, "Hammer")
-            self.assertEqual(round(result.hashrate), 4686)
+            self.assertEqual(round(result.hashrate.into(ScryptUnit.MH)), 4686)
             self.assertEqual(result.fans, [Fan(speed=4650), Fan(speed=4500)])
             self.assertEqual(result.total_chips, result.expected_chips)