diff --git a/pyasic/miners/antminer/hiveon/X9/T9.py b/pyasic/miners/antminer/hiveon/X9/T9.py index d9dd4832..3f806626 100644 --- a/pyasic/miners/antminer/hiveon/X9/T9.py +++ b/pyasic/miners/antminer/hiveon/X9/T9.py @@ -30,7 +30,7 @@ class HiveonT9(Hiveon, T9): ### DATA GATHERING FUNCTIONS (get_{some_data}) ### ################################################## - async def get_mac(self): + async def _get_mac(self): try: mac = ( (await self.send_ssh_command("cat /sys/class/net/eth0/address")) @@ -41,7 +41,7 @@ class HiveonT9(Hiveon, T9): except (TypeError, ValueError, asyncssh.Error, OSError, AttributeError): pass - async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: + async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: hashboards = [ HashBoard(slot=board, expected_chips=self.expected_chips) for board in range(self.expected_hashboards) @@ -83,7 +83,7 @@ class HiveonT9(Hiveon, T9): return hashboards - async def get_wattage(self, api_stats: dict = None) -> Optional[int]: + async def _get_wattage(self, api_stats: dict = None) -> Optional[int]: if not api_stats: try: api_stats = await self.api.stats() @@ -100,7 +100,7 @@ class HiveonT9(Hiveon, T9): # parse wattage position out of raw data return round(float(wattage_raw.split(" ")[0])) - async def get_env_temp(self, api_stats: dict = None) -> Optional[float]: + async def _get_env_temp(self, api_stats: dict = None) -> Optional[float]: env_temp_list = [] board_map = { 0: [2, 9, 10], diff --git a/pyasic/miners/backends/cgminer_avalon.py b/pyasic/miners/backends/cgminer_avalon.py index 893ceaa1..125472f8 100644 --- a/pyasic/miners/backends/cgminer_avalon.py +++ b/pyasic/miners/backends/cgminer_avalon.py @@ -364,5 +364,5 @@ class CGMinerAvalon(CGMiner): async def _is_mining(self, *args, **kwargs) -> Optional[bool]: return None - async def get_uptime(self) -> Optional[int]: + async def _get_uptime(self) -> Optional[int]: return None diff --git a/pyasic/miners/backends/hiveon.py b/pyasic/miners/backends/hiveon.py index 40a32406..22a6a48a 100644 --- a/pyasic/miners/backends/hiveon.py +++ b/pyasic/miners/backends/hiveon.py @@ -22,39 +22,39 @@ from pyasic.miners.base import DataFunction, DataLocations, DataOptions, RPCAPIC HIVEON_DATA_LOC = DataLocations( **{ - str(DataOptions.MAC): DataFunction("get_mac"), + str(DataOptions.MAC): DataFunction("_get_mac"), str(DataOptions.API_VERSION): DataFunction( - "get_api_ver", [RPCAPICommand("api_version", "version")] + "_get_api_ver", [RPCAPICommand("api_version", "version")] ), str(DataOptions.FW_VERSION): DataFunction( - "get_fw_ver", [RPCAPICommand("api_version", "version")] + "_get_fw_ver", [RPCAPICommand("api_version", "version")] ), - str(DataOptions.HOSTNAME): DataFunction("get_hostname"), + str(DataOptions.HOSTNAME): DataFunction("_get_hostname"), str(DataOptions.HASHRATE): DataFunction( - "get_hashrate", [RPCAPICommand("api_summary", "summary")] + "_get_hashrate", [RPCAPICommand("api_summary", "summary")] ), str(DataOptions.EXPECTED_HASHRATE): DataFunction( - "get_expected_hashrate", [RPCAPICommand("api_stats", "stats")] + "_get_expected_hashrate", [RPCAPICommand("api_stats", "stats")] ), str(DataOptions.HASHBOARDS): DataFunction( - "get_hashboards", [RPCAPICommand("api_stats", "stats")] + "_get_hashboards", [RPCAPICommand("api_stats", "stats")] ), str(DataOptions.ENVIRONMENT_TEMP): DataFunction( - "get_env_temp", [RPCAPICommand("api_stats", "stats")] + "_get_env_temp", [RPCAPICommand("api_stats", "stats")] ), str(DataOptions.WATTAGE): DataFunction( - "get_wattage", [RPCAPICommand("api_stats", "stats")] + "_get_wattage", [RPCAPICommand("api_stats", "stats")] ), - str(DataOptions.WATTAGE_LIMIT): DataFunction("get_wattage_limit"), + str(DataOptions.WATTAGE_LIMIT): DataFunction("_get_wattage_limit"), str(DataOptions.FANS): DataFunction( - "get_fans", [RPCAPICommand("api_stats", "stats")] + "_get_fans", [RPCAPICommand("api_stats", "stats")] ), - str(DataOptions.FAN_PSU): DataFunction("get_fan_psu"), - str(DataOptions.ERRORS): DataFunction("get_errors"), - str(DataOptions.FAULT_LIGHT): DataFunction("get_fault_light"), - str(DataOptions.IS_MINING): DataFunction("is_mining"), + str(DataOptions.FAN_PSU): DataFunction("_get_fan_psu"), + str(DataOptions.ERRORS): DataFunction("_get_errors"), + str(DataOptions.FAULT_LIGHT): DataFunction("_get_fault_light"), + str(DataOptions.IS_MINING): DataFunction("_is_mining"), str(DataOptions.UPTIME): DataFunction( - "get_uptime", [RPCAPICommand("api_stats", "stats")] + "_get_uptime", [RPCAPICommand("api_stats", "stats")] ), str(DataOptions.CONFIG): DataFunction("get_config"), } @@ -71,11 +71,11 @@ class Hiveon(BMMiner): # data gathering locations self.data_locations = HIVEON_DATA_LOC - async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: + async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: pass - async def get_wattage(self, api_stats: dict = None) -> Optional[int]: + async def _get_wattage(self, api_stats: dict = None) -> Optional[int]: pass - async def get_env_temp(self, api_stats: dict = None) -> Optional[float]: + async def _get_env_temp(self, api_stats: dict = None) -> Optional[float]: pass diff --git a/pyasic/miners/backends/innosilicon.py b/pyasic/miners/backends/innosilicon.py index 192bfeb6..135c908e 100644 --- a/pyasic/miners/backends/innosilicon.py +++ b/pyasic/miners/backends/innosilicon.py @@ -33,68 +33,67 @@ from pyasic.web.innosilicon import InnosiliconWebAPI INNOSILICON_DATA_LOC = DataLocations( **{ str(DataOptions.MAC): DataFunction( - "get_mac", + "_get_mac", [ WebAPICommand("web_get_all", "getAll"), WebAPICommand("web_overview", "overview"), ], ), - str(DataOptions.MODEL): DataFunction("get_model"), str(DataOptions.API_VERSION): DataFunction( - "get_api_ver", [RPCAPICommand("api_version", "version")] + "_get_api_ver", [RPCAPICommand("api_version", "version")] ), str(DataOptions.FW_VERSION): DataFunction( - "get_fw_ver", [RPCAPICommand("api_version", "version")] + "_get_fw_ver", [RPCAPICommand("api_version", "version")] ), - str(DataOptions.HOSTNAME): DataFunction("get_hostname"), + str(DataOptions.HOSTNAME): DataFunction("_get_hostname"), str(DataOptions.HASHRATE): DataFunction( - "get_hashrate", + "_get_hashrate", [ RPCAPICommand("api_summary", "summary"), WebAPICommand("web_get_all", "getAll"), ], ), str(DataOptions.EXPECTED_HASHRATE): DataFunction( - "get_expected_hashrate", + "_get_expected_hashrate", ), str(DataOptions.HASHBOARDS): DataFunction( - "get_hashboards", + "_get_hashboards", [ RPCAPICommand("api_stats", "stats"), WebAPICommand("web_get_all", "getAll"), ], ), - str(DataOptions.ENVIRONMENT_TEMP): DataFunction("get_env_temp"), + str(DataOptions.ENVIRONMENT_TEMP): DataFunction("_get_env_temp"), str(DataOptions.WATTAGE): DataFunction( - "get_wattage", + "_get_wattage", [ WebAPICommand("web_get_all", "getAll"), RPCAPICommand("api_stats", "stats"), ], ), str(DataOptions.WATTAGE_LIMIT): DataFunction( - "get_wattage_limit", + "_get_wattage_limit", [ WebAPICommand("web_get_all", "getAll"), ], ), str(DataOptions.FANS): DataFunction( - "get_fans", + "_get_fans", [ WebAPICommand("web_get_all", "getAll"), ], ), - str(DataOptions.FAN_PSU): DataFunction("get_fan_psu"), + str(DataOptions.FAN_PSU): DataFunction("_get_fan_psu"), str(DataOptions.ERRORS): DataFunction( - "get_errors", + "_get_errors", [ WebAPICommand("web_get_error_detail", "getErrorDetail"), ], ), - str(DataOptions.FAULT_LIGHT): DataFunction("get_fault_light"), + str(DataOptions.FAULT_LIGHT): DataFunction("_get_fault_light"), str(DataOptions.IS_MINING): DataFunction("is_mining"), str(DataOptions.UPTIME): DataFunction( - "get_uptime", [RPCAPICommand("api_stats", "stats")] + "_get_uptime", [RPCAPICommand("api_stats", "stats")] ), str(DataOptions.CONFIG): DataFunction("get_config"), } @@ -176,7 +175,7 @@ class Innosilicon(CGMiner): ### DATA GATHERING FUNCTIONS (get_{some_data}) ### ################################################## - async def get_mac( + async def _get_mac( self, web_get_all: dict = None, web_overview: dict = None ) -> Optional[str]: if web_get_all: @@ -202,7 +201,7 @@ class Innosilicon(CGMiner): except KeyError: pass - async def get_hashrate( + async def _get_hashrate( self, api_summary: dict = None, web_get_all: dict = None ) -> Optional[float]: if web_get_all: @@ -234,7 +233,7 @@ class Innosilicon(CGMiner): except (KeyError, IndexError): pass - async def get_hashboards( + async def _get_hashboards( self, api_stats: dict = None, web_get_all: dict = None ) -> List[HashBoard]: if web_get_all: @@ -292,7 +291,7 @@ class Innosilicon(CGMiner): return hashboards - async def get_wattage( + async def _get_wattage( self, web_get_all: dict = None, api_stats: dict = None ) -> Optional[int]: if web_get_all: @@ -329,7 +328,7 @@ class Innosilicon(CGMiner): wattage = int(wattage) return wattage - async def get_fans(self, web_get_all: dict = None) -> List[Fan]: + async def _get_fans(self, web_get_all: dict = None) -> List[Fan]: if web_get_all: web_get_all = web_get_all["all"] @@ -354,7 +353,7 @@ class Innosilicon(CGMiner): return fans - async def get_errors( + async def _get_errors( self, web_get_error_detail: dict = None ) -> List[MinerErrorData]: errors = [] @@ -377,7 +376,7 @@ class Innosilicon(CGMiner): errors.append(InnosiliconError(error_code=err)) return errors - async def get_wattage_limit(self, web_get_all: dict = None) -> Optional[int]: + async def _get_wattage_limit(self, web_get_all: dict = None) -> Optional[int]: if web_get_all: web_get_all = web_get_all["all"] @@ -400,5 +399,5 @@ class Innosilicon(CGMiner): limit = 1250 + (250 * level) return limit - async def get_expected_hashrate(self) -> Optional[float]: + async def _get_expected_hashrate(self) -> Optional[float]: pass diff --git a/tests/__init__.py b/tests/__init__.py index 23a60f58..0c5048c4 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -17,6 +17,8 @@ import unittest from tests.api_tests import * +from tests.config_tests import TestConfig +from tests.miners_tests import MinersTest from tests.network_tests import NetworkTest if __name__ == "__main__": diff --git a/tests/miners_tests/__init__.py b/tests/miners_tests/__init__.py index e0e700a6..104235ae 100644 --- a/tests/miners_tests/__init__.py +++ b/tests/miners_tests/__init__.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ +import inspect import unittest import warnings from dataclasses import asdict