CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: fix some issues with rpc renaming.

Browse Source
This commit is contained in:
UpstreamData
2024-01-29 12:32:37 -07:00
parent c443170f78
commit 30cd8b5cfe
7 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyasic/miners/backends/bfgminer.py
View File

@@ -68,7 +68,7 @@ class BFGMiner(BaseMiner):
except APIError: except APIError:
return self.config return self.config
self.config = MinerConfig.from_rpc(pools) self.config = MinerConfig.from_api(pools)
return self.config return self.config
################################################## ##################################################
@@ -84,11 +84,11 @@ class BFGMiner(BaseMiner):
if rpc_version is not None: if rpc_version is not None:
try: try:
self.rpc_ver = rpc_version["VERSION"][0]["API"] self.api_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
pass pass
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]: async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
if rpc_version is None: if rpc_version is None:

6
pyasic/miners/backends/bmminer.py
View File

@@ -72,7 +72,7 @@ class BMMiner(BaseMiner):
except APIError: except APIError:
return self.config return self.config
self.config = MinerConfig.from_rpc(pools) self.config = MinerConfig.from_api(pools)
return self.config return self.config
################################################## ##################################################
@@ -88,11 +88,11 @@ class BMMiner(BaseMiner):
if rpc_version is not None: if rpc_version is not None:
try: try:
self.rpc_ver = rpc_version["VERSION"][0]["API"] self.api_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
pass pass
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]: async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
if rpc_version is None: if rpc_version is None:

12
pyasic/miners/backends/braiins_os.py
View File

@@ -305,10 +305,10 @@ class BOSMiner(BaseMiner):
rpc_ver = rpc_version["VERSION"][0]["API"] rpc_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
rpc_ver = None rpc_ver = None
self.rpc_ver = rpc_ver self.api_ver = rpc_ver
self.rpc.rpc_ver = self.rpc_ver self.rpc.rpc_ver = self.api_ver
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, web_bos_info: dict = None) -> Optional[str]: async def _get_fw_ver(self, web_bos_info: dict = None) -> Optional[str]:
if web_bos_info is None: if web_bos_info is None:
@@ -731,10 +731,10 @@ class BOSer(BaseMiner):
rpc_ver = rpc_version["VERSION"][0]["API"] rpc_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
rpc_ver = None rpc_ver = None
self.rpc_ver = rpc_ver self.api_ver = rpc_ver
self.rpc.rpc_ver = self.rpc_ver self.rpc.rpc_ver = self.api_ver
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, grpc_miner_details: dict = None) -> Optional[str]: async def _get_fw_ver(self, grpc_miner_details: dict = None) -> Optional[str]:
if grpc_miner_details is None: if grpc_miner_details is None:

10
pyasic/miners/backends/btminer.py
View File

@@ -234,7 +234,7 @@ class BTMiner(BaseMiner):
pass pass
if pools is not None: if pools is not None:
cfg = MinerConfig.from_rpc(pools) cfg = MinerConfig.from_api(pools)
else: else:
cfg = MinerConfig() cfg = MinerConfig()
@@ -325,14 +325,14 @@ class BTMiner(BaseMiner):
rpc_ver = rpc_get_version["Msg"] rpc_ver = rpc_get_version["Msg"]
if not isinstance(rpc_ver, str): if not isinstance(rpc_ver, str):
rpc_ver = rpc_ver["rpc_ver"] rpc_ver = rpc_ver["rpc_ver"]
self.rpc_ver = rpc_ver.replace("whatsminer v", "") self.api_ver = rpc_ver.replace("whatsminer v", "")
except (KeyError, TypeError): except (KeyError, TypeError):
pass pass
else: else:
self.rpc.rpc_ver = self.rpc_ver self.rpc.rpc_ver = self.api_ver
return self.rpc_ver return self.api_ver
return self.rpc_ver return self.api_ver
async def _get_fw_ver( async def _get_fw_ver(
self, rpc_get_version: dict = None, rpc_summary: dict = None self, rpc_get_version: dict = None, rpc_summary: dict = None

6
pyasic/miners/backends/cgminer.py
View File

@@ -71,7 +71,7 @@ class CGMiner(BaseMiner):
except APIError: except APIError:
return self.config return self.config
self.config = MinerConfig.from_rpc(pools) self.config = MinerConfig.from_api(pools)
return self.config return self.config
################################################## ##################################################
@@ -87,11 +87,11 @@ class CGMiner(BaseMiner):
if rpc_version is not None: if rpc_version is not None:
try: try:
self.rpc_ver = rpc_version["VERSION"][0]["API"] self.api_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
pass pass
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]: async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
if rpc_version is None: if rpc_version is None:

1
pyasic/misc/__init__.py
View File

@@ -107,3 +107,4 @@ def validate_command_output(data: dict) -> tuple[bool, str | None]:
if data[key][0]["STATUS"][0]["STATUS"] not in ["S", "I"]: if data[key][0]["STATUS"][0]["STATUS"] not in ["S", "I"]:
# this is an error # this is an error
return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"] return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"]
return True, None

2
pyasic/rpc/base.py
View File

@@ -90,7 +90,7 @@ class BaseMinerRPCAPI:
if not validation[0]: if not validation[0]:
if not ignore_errors: if not ignore_errors:
# validate the command succeeded # validate the command succeeded
raise APIError(validation[1]) raise APIError(f"{command}: {validation[1]}")
if allow_warning: if allow_warning:
logging.warning( logging.warning(
f"{self.ip}: API Command Error: {command}: {validation[1]}" f"{self.ip}: API Command Error: {command}: {validation[1]}"