refactor: remove some unused variables.
This commit is contained in:
@@ -18,7 +18,6 @@ from typing import Optional
|
|||||||
|
|
||||||
from pyasic import MinerConfig
|
from pyasic import MinerConfig
|
||||||
from pyasic.errors import APIError
|
from pyasic.errors import APIError
|
||||||
from pyasic.logger import logger
|
|
||||||
from pyasic.miners.backends.bmminer import BMMiner
|
from pyasic.miners.backends.bmminer import BMMiner
|
||||||
from pyasic.miners.base import (
|
from pyasic.miners.base import (
|
||||||
DataFunction,
|
DataFunction,
|
||||||
|
|||||||
@@ -55,10 +55,10 @@ class MinerListener(metaclass=Singleton):
|
|||||||
|
|
||||||
loop = asyncio.get_running_loop()
|
loop = asyncio.get_running_loop()
|
||||||
|
|
||||||
transport_14235, protocol_14235 = await loop.create_datagram_endpoint(
|
transport_14235, _ = await loop.create_datagram_endpoint(
|
||||||
lambda: _MinerListener(), local_addr=("0.0.0.0", 14235) # noqa
|
lambda: _MinerListener(), local_addr=("0.0.0.0", 14235) # noqa
|
||||||
)
|
)
|
||||||
transport_8888, protocol_8888 = await loop.create_datagram_endpoint(
|
transport_8888, _ = await loop.create_datagram_endpoint(
|
||||||
lambda: _MinerListener(), local_addr=("0.0.0.0", 8888) # noqa
|
lambda: _MinerListener(), local_addr=("0.0.0.0", 8888) # noqa
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
from typing import List, Optional, Tuple
|
from typing import List, Optional, Tuple
|
||||||
|
|
||||||
from pyasic.config import MinerConfig
|
from pyasic.config import MinerConfig
|
||||||
from pyasic.data import Fan, HashBoard, MinerData
|
from pyasic.data import Fan, HashBoard
|
||||||
from pyasic.data.error_codes import MinerErrorData
|
from pyasic.data.error_codes import MinerErrorData
|
||||||
from pyasic.miners.base import BaseMiner
|
from pyasic.miners.base import BaseMiner
|
||||||
from pyasic.rpc.unknown import UnknownRPCAPI
|
from pyasic.rpc.unknown import UnknownRPCAPI
|
||||||
|
|||||||
@@ -77,19 +77,19 @@ class MinerNetwork:
|
|||||||
|
|
||||||
hosts = []
|
hosts = []
|
||||||
|
|
||||||
oct_1_val_start, oct_1_start, oct_1_end = compute_oct_range(oct_1)
|
oct_1_start, oct_1_end = compute_oct_range(oct_1)
|
||||||
for oct_1_idx in range((abs(oct_1_end - oct_1_start)) + 1):
|
for oct_1_idx in range((abs(oct_1_end - oct_1_start)) + 1):
|
||||||
oct_1_val = str(oct_1_idx + oct_1_start)
|
oct_1_val = str(oct_1_idx + oct_1_start)
|
||||||
|
|
||||||
oct_2_val_start, oct_2_start, oct_2_end = compute_oct_range(oct_2)
|
oct_2_start, oct_2_end = compute_oct_range(oct_2)
|
||||||
for oct_2_idx in range((abs(oct_2_end - oct_2_start)) + 1):
|
for oct_2_idx in range((abs(oct_2_end - oct_2_start)) + 1):
|
||||||
oct_2_val = str(oct_2_idx + oct_2_start)
|
oct_2_val = str(oct_2_idx + oct_2_start)
|
||||||
|
|
||||||
oct_3_val_start, oct_3_start, oct_3_end = compute_oct_range(oct_3)
|
oct_3_start, oct_3_end = compute_oct_range(oct_3)
|
||||||
for oct_3_idx in range((abs(oct_3_end - oct_3_start)) + 1):
|
for oct_3_idx in range((abs(oct_3_end - oct_3_start)) + 1):
|
||||||
oct_3_val = str(oct_3_idx + oct_3_start)
|
oct_3_val = str(oct_3_idx + oct_3_start)
|
||||||
|
|
||||||
oct_4_val_start, oct_4_start, oct_4_end = compute_oct_range(oct_4)
|
oct_4_start, oct_4_end = compute_oct_range(oct_4)
|
||||||
for oct_4_idx in range((abs(oct_4_end - oct_4_start)) + 1):
|
for oct_4_idx in range((abs(oct_4_end - oct_4_start)) + 1):
|
||||||
oct_4_val = str(oct_4_idx + oct_4_start)
|
oct_4_val = str(oct_4_idx + oct_4_start)
|
||||||
|
|
||||||
@@ -172,11 +172,11 @@ class MinerNetwork:
|
|||||||
async def ping_and_get_miner(
|
async def ping_and_get_miner(
|
||||||
ip: ipaddress.ip_address, port=80
|
ip: ipaddress.ip_address, port=80
|
||||||
) -> Union[None, AnyMiner]:
|
) -> Union[None, AnyMiner]:
|
||||||
for i in range(settings.get("network_ping_retries", 1)):
|
for _ in range(settings.get("network_ping_retries", 1)):
|
||||||
try:
|
try:
|
||||||
connection_fut = asyncio.open_connection(str(ip), port)
|
connection_fut = asyncio.open_connection(str(ip), port)
|
||||||
# get the read and write streams from the connection
|
# get the read and write streams from the connection
|
||||||
reader, writer = await asyncio.wait_for(
|
_, writer = await asyncio.wait_for(
|
||||||
connection_fut, timeout=settings.get("network_ping_timeout", 3)
|
connection_fut, timeout=settings.get("network_ping_timeout", 3)
|
||||||
)
|
)
|
||||||
# immediately close connection, we know connection happened
|
# immediately close connection, we know connection happened
|
||||||
@@ -207,6 +207,4 @@ def compute_oct_range(octet: str) -> tuple:
|
|||||||
if octet_end is None:
|
if octet_end is None:
|
||||||
octet_end = int(octet_start)
|
octet_end = int(octet_start)
|
||||||
|
|
||||||
octet_val_start = min([octet_start, octet_end])
|
return octet_start, octet_end
|
||||||
|
|
||||||
return octet_val_start, octet_start, octet_end
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ class GoldshellWebAPI(BaseWebAPI):
|
|||||||
if not self.jwt:
|
if not self.jwt:
|
||||||
await self.auth()
|
await self.auth()
|
||||||
async with httpx.AsyncClient(transport=settings.transport()) as client:
|
async with httpx.AsyncClient(transport=settings.transport()) as client:
|
||||||
for i in range(settings.get("get_data_retries", 1)):
|
for _ in range(settings.get("get_data_retries", 1)):
|
||||||
try:
|
try:
|
||||||
if parameters:
|
if parameters:
|
||||||
response = await client.put(
|
response = await client.put(
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class InnosiliconWebAPI(BaseWebAPI):
|
|||||||
if not self.jwt:
|
if not self.jwt:
|
||||||
await self.auth()
|
await self.auth()
|
||||||
async with httpx.AsyncClient(transport=settings.transport()) as client:
|
async with httpx.AsyncClient(transport=settings.transport()) as client:
|
||||||
for i in range(settings.get("get_data_retries", 1)):
|
for _ in range(settings.get("get_data_retries", 1)):
|
||||||
try:
|
try:
|
||||||
response = await client.post(
|
response = await client.post(
|
||||||
f"http://{self.ip}:{self.port}/api/{command}",
|
f"http://{self.ip}:{self.port}/api/{command}",
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ class VNishWebAPI(BaseWebAPI):
|
|||||||
if not self.token:
|
if not self.token:
|
||||||
await self.auth()
|
await self.auth()
|
||||||
async with httpx.AsyncClient(transport=settings.transport()) as client:
|
async with httpx.AsyncClient(transport=settings.transport()) as client:
|
||||||
for i in range(settings.get("get_data_retries", 1)):
|
for _ in range(settings.get("get_data_retries", 1)):
|
||||||
try:
|
try:
|
||||||
auth = self.token
|
auth = self.token
|
||||||
if command.startswith("system"):
|
if command.startswith("system"):
|
||||||
|
|||||||
Reference in New Issue
Block a user