fixed minor bugs in the API implmentation

This commit is contained in:
UpstreamData
2021-09-23 10:55:54 -06:00
parent d460547591
commit 5cdf04e62e
4 changed files with 8 additions and 6 deletions

View File

@@ -21,14 +21,14 @@ class BaseMinerAPI:
self.port = port
self.ip = ip
async def send_command(self, command, parameters=None):
async def send_command(self, command, parameters: dict = None):
# get reader and writer streams
reader, writer = await asyncio.open_connection(self.ip, self.port)
# create the command
cmd = {"command": command}
if parameters:
cmd["parameters"] = parameters
if parameters is not None:
cmd["parameter"] = parameters
# send the command
writer.write(json.dumps(cmd).encode('utf-8'))
@@ -53,6 +53,8 @@ class BaseMinerAPI:
# check if the data returned is correct or an error
if not data["STATUS"][0]["STATUS"] in ("S", "I"):
# this is an error
print(cmd)
print(data)
raise APIError(data["STATUS"][0]["Msg"])
# return the data

View File

@@ -39,7 +39,7 @@ class BMMinerAPI(BaseMinerAPI):
return await self.send_command("enablepool", parameters=n)
async def addpool(self, url: str, username: str, password: str):
return await self.send_command("enablepool", parameters=f"{url}, {username}, {password}")
return await self.send_command("addpool", parameters=f"{url}, {username}, {password}")
async def poolpriority(self, *n: int):
return await self.send_command("poolpriority", parameters=f"{','.join(n)}")

View File

@@ -57,7 +57,7 @@ class BOSMinerAPI(BaseMinerAPI):
return await self.send_command("disablepool", parameters=n)
async def addpool(self, url: str, username: str, password: str):
return await self.send_command("enablepool", parameters=f"{url}, {username}, {password}")
return await self.send_command("addpool", parameters=f"{url}, {username}, {password}")
async def removepool(self, n: int):
return await self.send_command("removepool", parameters=n)

View File

@@ -4,7 +4,7 @@ import asyncio
async def main():
bosminer = BOSMinerAPI("172.16.1.199")
data = await bosminer.stats()
data = await bosminer.edevs(old=True)
print(data)