From 6da9b580889239405058a466e2a0dfbe9d5e0eaa Mon Sep 17 00:00:00 2001 From: Upstream Data Date: Fri, 4 Nov 2022 20:26:28 -0600 Subject: [PATCH] bug: fix missing initialization variables on HashBoard when being called from within `get_data` on bos, T9, and btminer. --- pyasic/miners/_backends/bmminer.py | 6 +++++- pyasic/miners/_backends/bosminer.py | 3 ++- pyasic/miners/_backends/btminer.py | 2 +- pyasic/miners/antminer/hiveon/X9/T9.py | 10 ++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pyasic/miners/_backends/bmminer.py b/pyasic/miners/_backends/bmminer.py index 8f645761..469dd671 100644 --- a/pyasic/miners/_backends/bmminer.py +++ b/pyasic/miners/_backends/bmminer.py @@ -191,7 +191,11 @@ class BMMiner(BaseMiner): Returns: A [`MinerData`][pyasic.data.MinerData] instance containing the miners data. """ - data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3) + data = MinerData( + ip=str(self.ip), + ideal_chips=self.nominal_chips * self.ideal_hashboards, + ideal_hashboards=self.ideal_hashboards, + ) board_offset = -1 fan_offset = -1 diff --git a/pyasic/miners/_backends/bosminer.py b/pyasic/miners/_backends/bosminer.py index dcd70c10..1ec0af66 100644 --- a/pyasic/miners/_backends/bosminer.py +++ b/pyasic/miners/_backends/bosminer.py @@ -302,7 +302,8 @@ class BOSMiner(BaseMiner): """ data = MinerData( ip=str(self.ip), - ideal_chips=self.nominal_chips * 3, + ideal_chips=self.nominal_chips * self.ideal_hashboards, + ideal_hashboards=self.ideal_hashboards, hashboards=[ HashBoard(slot=i, expected_chips=self.nominal_chips) for i in range(self.ideal_hashboards) diff --git a/pyasic/miners/_backends/btminer.py b/pyasic/miners/_backends/btminer.py index a5716b22..41ff37b5 100644 --- a/pyasic/miners/_backends/btminer.py +++ b/pyasic/miners/_backends/btminer.py @@ -247,7 +247,7 @@ class BTMiner(BaseMiner): A [`MinerData`][pyasic.data.MinerData] instance containing the miners data. """ data = MinerData( - ip=str(self.ip), ideal_chips=self.nominal_chips * self.ideal_hashboards + ip=str(self.ip), ideal_chips=self.nominal_chips * self.ideal_hashboards, ideal_hashboards=self.ideal_hashboards, ) mac = None diff --git a/pyasic/miners/antminer/hiveon/X9/T9.py b/pyasic/miners/antminer/hiveon/X9/T9.py index 5cb97031..44fb209b 100644 --- a/pyasic/miners/antminer/hiveon/X9/T9.py +++ b/pyasic/miners/antminer/hiveon/X9/T9.py @@ -39,7 +39,11 @@ class HiveonT9(Hiveon, T9): Returns: A [`MinerData`][pyasic.data.MinerData] instance containing the miners data. """ - data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3) + data = MinerData( + ip=str(self.ip), + ideal_chips=self.nominal_chips * self.ideal_hashboards, + ideal_hashboards=self.ideal_hashboards, + ) board_offset = -1 fan_offset = -1 @@ -105,7 +109,9 @@ class HiveonT9(Hiveon, T9): env_temp_list = [] for board in board_map.keys(): - hashboard = HashBoard(slot=board, expected_chips=self.nominal_chips) + hashboard = HashBoard( + slot=board, expected_chips=self.nominal_chips + ) chips = 0 hashrate = 0 chip_temp = 0