From 269e6aac14d3c205b71aaaf2692126e2edfbeebd Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Mon, 15 Jan 2024 10:35:15 -0700 Subject: [PATCH] bug: add more tests and finish renaming methods. --- pyasic/miners/backends/antminer.py | 2 +- pyasic/miners/backends/innosilicon.py | 2 +- tests/miners_tests/__init__.py | 22 +++++++++++++++++++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pyasic/miners/backends/antminer.py b/pyasic/miners/backends/antminer.py index 7e7d5c33..6dcbeedc 100644 --- a/pyasic/miners/backends/antminer.py +++ b/pyasic/miners/backends/antminer.py @@ -58,7 +58,7 @@ ANTMINER_MODERN_DATA_LOC = DataLocations( str(DataOptions.FANS): DataFunction( "_get_fans", [RPCAPICommand("api_stats", "stats")] ), - str(DataOptions.FAN_PSU): DataFunction("get_fan_psu"), + str(DataOptions.FAN_PSU): DataFunction("_get_fan_psu"), str(DataOptions.ERRORS): DataFunction( "_get_errors", [WebAPICommand("web_summary", "summary")] ), diff --git a/pyasic/miners/backends/innosilicon.py b/pyasic/miners/backends/innosilicon.py index 135c908e..9e85525a 100644 --- a/pyasic/miners/backends/innosilicon.py +++ b/pyasic/miners/backends/innosilicon.py @@ -91,7 +91,7 @@ INNOSILICON_DATA_LOC = DataLocations( ], ), str(DataOptions.FAULT_LIGHT): DataFunction("_get_fault_light"), - str(DataOptions.IS_MINING): DataFunction("is_mining"), + str(DataOptions.IS_MINING): DataFunction("_is_mining"), str(DataOptions.UPTIME): DataFunction( "_get_uptime", [RPCAPICommand("api_stats", "stats")] ), diff --git a/tests/miners_tests/__init__.py b/tests/miners_tests/__init__.py index 104235ae..c1c4cfaa 100644 --- a/tests/miners_tests/__init__.py +++ b/tests/miners_tests/__init__.py @@ -28,7 +28,7 @@ class MinersTest(unittest.TestCase): for miner_model in MINER_CLASSES.keys(): for miner_api in MINER_CLASSES[miner_model].keys(): with self.subTest( - msg=f"Creation of miner using model={miner_model}, api={miner_api}", + msg=f"Test creation of miner", miner_model=miner_model, miner_api=miner_api, ): @@ -63,7 +63,7 @@ class MinersTest(unittest.TestCase): for miner_model in MINER_CLASSES.keys(): for miner_api in MINER_CLASSES[miner_model].keys(): with self.subTest( - msg=f"Data map key check of miner using model={miner_model}, api={miner_api}", + msg=f"Data map key check", miner_model=miner_model, miner_api=miner_api, ): @@ -80,7 +80,7 @@ class MinersTest(unittest.TestCase): miner = MINER_CLASSES[miner_model][miner_api]("127.0.0.1") for data_point in asdict(miner.data_locations).values(): with self.subTest( - msg=f"Test {data_point['cmd']} signature matches with model={miner_model}, api={miner_api}", + msg=f"Test {data_point['cmd']} signature matches", miner_model=miner_model, miner_api=miner_api, ): @@ -98,6 +98,22 @@ class MinersTest(unittest.TestCase): set([k["name"] for k in data_point["kwargs"]]), ) + def test_data_locations_use_private_funcs(self): + warnings.filterwarnings("ignore") + for miner_model in MINER_CLASSES.keys(): + for miner_api in MINER_CLASSES[miner_model].keys(): + miner = MINER_CLASSES[miner_model][miner_api]("127.0.0.1") + for data_point in asdict(miner.data_locations).values(): + with self.subTest( + msg=f"Test {data_point['cmd']} is private", + miner_model=miner_model, + miner_api=miner_api, + ): + self.assertTrue( + data_point["cmd"].startswith("_") + or data_point["cmd"] == "get_config" + ) + if __name__ == "__main__": unittest.main()