From f3b25027adaccd1c797c7ee45f309243ef680064 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Thu, 10 Nov 2022 14:15:45 -0700 Subject: [PATCH] format: add `isort` to pre-commit and sort imports. --- pyasic/API/__init__.py | 6 +-- pyasic/API/bmminer.py | 3 +- pyasic/API/btminer.py | 13 +++--- pyasic/API/cgminer.py | 4 +- pyasic/__init__.py | 8 +--- pyasic/config/__init__.py | 8 ++-- pyasic/data/__init__.py | 12 ++--- pyasic/data/error_codes/X19.py | 2 +- pyasic/data/error_codes/__init__.py | 10 ++-- pyasic/data/error_codes/bos.py | 2 +- pyasic/data/error_codes/innosilicon.py | 2 +- pyasic/data/error_codes/whatsminer.py | 2 +- pyasic/logger/__init__.py | 1 + pyasic/miners/__init__.py | 3 +- pyasic/miners/_backends/bmminer.py | 9 ++-- pyasic/miners/_backends/bosminer.py | 16 +++---- pyasic/miners/_backends/bosminer_old.py | 7 ++- pyasic/miners/_backends/btminer.py | 13 ++---- pyasic/miners/_backends/cgminer.py | 11 ++--- pyasic/miners/_backends/hiveon.py | 3 +- pyasic/miners/_types/__init__.py | 2 +- pyasic/miners/_types/antminer/X17/__init__.py | 1 - pyasic/miners/_types/antminer/X19/__init__.py | 8 +--- .../miners/_types/whatsminer/M2X/__init__.py | 1 - .../miners/_types/whatsminer/M3X/__init__.py | 10 ++-- pyasic/miners/antminer/bmminer/X17/S17.py | 3 +- .../miners/antminer/bmminer/X17/S17_Plus.py | 3 +- pyasic/miners/antminer/bmminer/X17/S17_Pro.py | 3 +- pyasic/miners/antminer/bmminer/X17/S17e.py | 3 +- pyasic/miners/antminer/bmminer/X17/T17.py | 3 +- .../miners/antminer/bmminer/X17/T17_Plus.py | 3 +- pyasic/miners/antminer/bmminer/X17/T17e.py | 3 +- pyasic/miners/antminer/bmminer/X17/X17.py | 8 ++-- .../miners/antminer/bmminer/X17/__init__.py | 1 - pyasic/miners/antminer/bmminer/X19/S19.py | 3 +- pyasic/miners/antminer/bmminer/X19/S19_Pro.py | 3 +- pyasic/miners/antminer/bmminer/X19/S19_XP.py | 3 +- pyasic/miners/antminer/bmminer/X19/S19a.py | 3 +- pyasic/miners/antminer/bmminer/X19/S19j.py | 3 +- .../miners/antminer/bmminer/X19/S19j_Pro.py | 3 +- pyasic/miners/antminer/bmminer/X19/T19.py | 3 +- pyasic/miners/antminer/bmminer/X19/X19.py | 16 +++---- .../miners/antminer/bmminer/X19/__init__.py | 8 +--- .../miners/antminer/bosminer/X17/__init__.py | 1 - .../miners/antminer/bosminer/X19/__init__.py | 2 - .../miners/antminer/cgminer/X17/__init__.py | 1 - .../miners/antminer/cgminer/X19/__init__.py | 2 - pyasic/miners/antminer/hiveon/X9/T9.py | 3 +- .../miners/avalonminer/cgminer/A10X/A1026.py | 3 +- .../miners/avalonminer/cgminer/A10X/A1047.py | 3 +- .../miners/avalonminer/cgminer/A10X/A1066.py | 3 +- .../miners/avalonminer/cgminer/A10X/A10X.py | 12 ++--- pyasic/miners/avalonminer/cgminer/A7X/A721.py | 3 +- pyasic/miners/avalonminer/cgminer/A7X/A741.py | 3 +- pyasic/miners/avalonminer/cgminer/A7X/A761.py | 3 +- pyasic/miners/avalonminer/cgminer/A7X/A7X.py | 12 ++--- pyasic/miners/avalonminer/cgminer/A8X/A821.py | 3 +- pyasic/miners/avalonminer/cgminer/A8X/A841.py | 3 +- pyasic/miners/avalonminer/cgminer/A8X/A851.py | 3 +- pyasic/miners/avalonminer/cgminer/A8X/A8X.py | 12 ++--- pyasic/miners/avalonminer/cgminer/A9X/A921.py | 10 ++-- pyasic/miners/base.py | 13 +++--- .../innosilicon/cgminer/T3X/T3H_Plus.py | 21 +++++---- pyasic/miners/miner_factory.py | 46 ++++++++----------- pyasic/miners/unknown.py | 2 +- pyasic/miners/whatsminer/btminer/M2X/M20.py | 5 +- pyasic/miners/whatsminer/btminer/M2X/M21S.py | 4 +- .../miners/whatsminer/btminer/M2X/__init__.py | 1 - pyasic/miners/whatsminer/btminer/M3X/M30S.py | 8 ++-- .../whatsminer/btminer/M3X/M30S_Plus.py | 4 +- .../whatsminer/btminer/M3X/M30S_Plus_Plus.py | 2 +- .../whatsminer/btminer/M3X/M31S_Plus.py | 6 +-- pyasic/miners/whatsminer/btminer/M3X/M32S.py | 4 +- .../whatsminer/btminer/M3X/M34S_Plus.py | 4 +- .../miners/whatsminer/btminer/M3X/__init__.py | 10 ++-- .../miners/whatsminer/btminer/M5X/__init__.py | 5 +- pyasic/network/__init__.py | 6 +-- pyasic/network/net_range.py | 2 +- tests/__init__.py | 5 +- tests/config_tests/__init__.py | 5 +- tests/miners_tests/__init__.py | 15 +++--- tests/network_tests/__init__.py | 2 +- 82 files changed, 226 insertions(+), 258 deletions(-) diff --git a/pyasic/API/__init__.py b/pyasic/API/__init__.py index f9b2a26c..020c3c79 100644 --- a/pyasic/API/__init__.py +++ b/pyasic/API/__init__.py @@ -13,12 +13,12 @@ # limitations under the License. import asyncio -import json import ipaddress -import warnings +import json import logging -from typing import Union import re +import warnings +from typing import Union from pyasic.errors import APIError, APIWarning diff --git a/pyasic/API/bmminer.py b/pyasic/API/bmminer.py index bead3b9a..5a5394ba 100644 --- a/pyasic/API/bmminer.py +++ b/pyasic/API/bmminer.py @@ -13,8 +13,7 @@ # limitations under the License. import logging -from pyasic.API import BaseMinerAPI -from pyasic.API import APIError +from pyasic.API import APIError, BaseMinerAPI class BMMinerAPI(BaseMinerAPI): diff --git a/pyasic/API/btminer.py b/pyasic/API/btminer.py index 49ed1bbd..917d1a9b 100644 --- a/pyasic/API/btminer.py +++ b/pyasic/API/btminer.py @@ -13,22 +13,21 @@ # limitations under the License. import asyncio -import re -import json -import hashlib -import binascii import base64 +import binascii +import hashlib +import json import logging +import re from typing import Union -from passlib.handlers.md5_crypt import md5_crypt from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes +from passlib.handlers.md5_crypt import md5_crypt -from pyasic.errors import APIError from pyasic.API import BaseMinerAPI +from pyasic.errors import APIError from pyasic.settings import PyasicSettings - ### IMPORTANT ### # you need to change the password of the miners using the Whatsminer # tool, then you can set them back to admin with this tool, but they diff --git a/pyasic/API/cgminer.py b/pyasic/API/cgminer.py index bb5eefab..770a0fa1 100644 --- a/pyasic/API/cgminer.py +++ b/pyasic/API/cgminer.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.API import BaseMinerAPI, APIError - import logging +from pyasic.API import APIError, BaseMinerAPI + class CGMinerAPI(BaseMinerAPI): """An abstraction of the CGMiner API. diff --git a/pyasic/__init__.py b/pyasic/__init__.py index 1b4aea78..3d9811ec 100644 --- a/pyasic/__init__.py +++ b/pyasic/__init__.py @@ -16,26 +16,20 @@ from pyasic.API.bosminer import BOSMinerAPI from pyasic.API.btminer import BTMinerAPI from pyasic.API.cgminer import CGMinerAPI from pyasic.API.unknown import UnknownAPI - from pyasic.config import MinerConfig - from pyasic.data import ( - MinerData, BraiinsOSError, InnosiliconError, + MinerData, WhatsminerError, X19Error, ) - from pyasic.errors import APIError, APIWarning - from pyasic.miners import get_miner from pyasic.miners.base import AnyMiner from pyasic.miners.miner_factory import MinerFactory from pyasic.miners.miner_listener import MinerListener - from pyasic.network import MinerNetwork - from pyasic.settings import PyasicSettings __all__ = [ diff --git a/pyasic/config/__init__.py b/pyasic/config/__init__.py index 4fa575f7..613b5b2a 100644 --- a/pyasic/config/__init__.py +++ b/pyasic/config/__init__.py @@ -12,15 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dataclasses import dataclass, asdict, fields -from typing import Literal, List +import json import random import string +import time +from dataclasses import asdict, dataclass, fields +from typing import List, Literal import toml import yaml -import json -import time @dataclass diff --git a/pyasic/data/__init__.py b/pyasic/data/__init__.py index a033c5a7..ae0840f0 100644 --- a/pyasic/data/__init__.py +++ b/pyasic/data/__init__.py @@ -12,15 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Union, List -from dataclasses import dataclass, field, asdict, fields +import copy +import json +import time +from dataclasses import asdict, dataclass, field, fields from datetime import datetime, timezone from functools import reduce -import time -import json -import copy +from typing import List, Union -from .error_codes import X19Error, WhatsminerError, BraiinsOSError, InnosiliconError +from .error_codes import BraiinsOSError, InnosiliconError, WhatsminerError, X19Error @dataclass diff --git a/pyasic/data/error_codes/X19.py b/pyasic/data/error_codes/X19.py index 852848bf..83ef8ba5 100644 --- a/pyasic/data/error_codes/X19.py +++ b/pyasic/data/error_codes/X19.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dataclasses import dataclass, asdict, fields +from dataclasses import asdict, dataclass, fields @dataclass diff --git a/pyasic/data/error_codes/__init__.py b/pyasic/data/error_codes/__init__.py index 484a0507..64e5f600 100644 --- a/pyasic/data/error_codes/__init__.py +++ b/pyasic/data/error_codes/__init__.py @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .whatsminer import WhatsminerError -from .bos import BraiinsOSError -from .X19 import X19Error -from .innosilicon import InnosiliconError - from typing import TypeVar +from .bos import BraiinsOSError +from .innosilicon import InnosiliconError +from .whatsminer import WhatsminerError +from .X19 import X19Error + MinerErrorData = TypeVar( "MinerErrorData", WhatsminerError, BraiinsOSError, X19Error, InnosiliconError ) diff --git a/pyasic/data/error_codes/bos.py b/pyasic/data/error_codes/bos.py index abe10dfb..2dcdc1fa 100644 --- a/pyasic/data/error_codes/bos.py +++ b/pyasic/data/error_codes/bos.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dataclasses import dataclass, asdict, fields +from dataclasses import asdict, dataclass, fields @dataclass diff --git a/pyasic/data/error_codes/innosilicon.py b/pyasic/data/error_codes/innosilicon.py index c779efe1..00264ad2 100644 --- a/pyasic/data/error_codes/innosilicon.py +++ b/pyasic/data/error_codes/innosilicon.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dataclasses import dataclass, field, asdict, fields +from dataclasses import asdict, dataclass, field, fields @dataclass diff --git a/pyasic/data/error_codes/whatsminer.py b/pyasic/data/error_codes/whatsminer.py index a20a5dc6..5b83d197 100644 --- a/pyasic/data/error_codes/whatsminer.py +++ b/pyasic/data/error_codes/whatsminer.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from dataclasses import dataclass, field, asdict, fields +from dataclasses import asdict, dataclass, field, fields @dataclass diff --git a/pyasic/logger/__init__.py b/pyasic/logger/__init__.py index ec252cab..c2245ee5 100644 --- a/pyasic/logger/__init__.py +++ b/pyasic/logger/__init__.py @@ -13,6 +13,7 @@ # limitations under the License. import logging + from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/__init__.py b/pyasic/miners/__init__.py index 2c0b2846..6be62099 100644 --- a/pyasic/miners/__init__.py +++ b/pyasic/miners/__init__.py @@ -15,9 +15,10 @@ import ipaddress from typing import Union -from pyasic.miners.base import BaseMiner, AnyMiner +from pyasic.miners.base import AnyMiner, BaseMiner from pyasic.miners.miner_factory import MinerFactory + # abstracted version of get miner that is easier to access async def get_miner(ip: Union[ipaddress.ip_address, str]) -> AnyMiner: return await MinerFactory().get_miner(ip) diff --git a/pyasic/miners/_backends/bmminer.py b/pyasic/miners/_backends/bmminer.py index 17d64879..b27e8cda 100644 --- a/pyasic/miners/_backends/bmminer.py +++ b/pyasic/miners/_backends/bmminer.py @@ -14,16 +14,13 @@ import ipaddress import logging -from typing import Union, List - +from typing import List, Union from pyasic.API.bmminer import BMMinerAPI -from pyasic.miners.base import BaseMiner - -from pyasic.data import MinerData, HashBoard from pyasic.config import MinerConfig +from pyasic.data import HashBoard, MinerData from pyasic.data.error_codes import MinerErrorData - +from pyasic.miners.base import BaseMiner from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/_backends/bosminer.py b/pyasic/miners/_backends/bosminer.py index 4522e396..38d5bb23 100644 --- a/pyasic/miners/_backends/bosminer.py +++ b/pyasic/miners/_backends/bosminer.py @@ -13,22 +13,18 @@ # limitations under the License. import ipaddress -import logging import json -from typing import Union, List +import logging +from typing import List, Union import toml - -from pyasic.miners.base import BaseMiner from pyasic.API.bosminer import BOSMinerAPI -from pyasic.errors import APIError - -from pyasic.data.error_codes import BraiinsOSError, MinerErrorData -from pyasic.data import MinerData, HashBoard - from pyasic.config import MinerConfig - +from pyasic.data import HashBoard, MinerData +from pyasic.data.error_codes import BraiinsOSError, MinerErrorData +from pyasic.errors import APIError +from pyasic.miners.base import BaseMiner from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/_backends/bosminer_old.py b/pyasic/miners/_backends/bosminer_old.py index eef574a6..89588bdb 100644 --- a/pyasic/miners/_backends/bosminer_old.py +++ b/pyasic/miners/_backends/bosminer_old.py @@ -12,16 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging - import ipaddress -from typing import Union, List +import logging +from typing import List, Union from pyasic.API.bosminer import BOSMinerAPI -from pyasic.miners.base import BaseMiner from pyasic.config import MinerConfig from pyasic.data import MinerData from pyasic.data.error_codes import MinerErrorData +from pyasic.miners.base import BaseMiner class BOSMinerOld(BaseMiner): diff --git a/pyasic/miners/_backends/btminer.py b/pyasic/miners/_backends/btminer.py index 008a1f6b..e57f6f93 100644 --- a/pyasic/miners/_backends/btminer.py +++ b/pyasic/miners/_backends/btminer.py @@ -14,17 +14,14 @@ import ipaddress import logging -from typing import Union, List - +from typing import List, Union from pyasic.API.btminer import BTMinerAPI -from pyasic.miners.base import BaseMiner -from pyasic.errors import APIError - -from pyasic.data import MinerData, HashBoard -from pyasic.data.error_codes import WhatsminerError, MinerErrorData from pyasic.config import MinerConfig - +from pyasic.data import HashBoard, MinerData +from pyasic.data.error_codes import MinerErrorData, WhatsminerError +from pyasic.errors import APIError +from pyasic.miners.base import BaseMiner from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/_backends/cgminer.py b/pyasic/miners/_backends/cgminer.py index 8e5cc01e..8e2e38ef 100644 --- a/pyasic/miners/_backends/cgminer.py +++ b/pyasic/miners/_backends/cgminer.py @@ -14,17 +14,14 @@ import ipaddress import logging -from typing import Union, List - +from typing import List, Union from pyasic.API.cgminer import CGMinerAPI -from pyasic.miners.base import BaseMiner -from pyasic.errors import APIError from pyasic.config import MinerConfig - -from pyasic.data import MinerData, HashBoard +from pyasic.data import HashBoard, MinerData from pyasic.data.error_codes import MinerErrorData - +from pyasic.errors import APIError +from pyasic.miners.base import BaseMiner from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/_backends/hiveon.py b/pyasic/miners/_backends/hiveon.py index 884350ac..1a93087a 100644 --- a/pyasic/miners/_backends/hiveon.py +++ b/pyasic/miners/_backends/hiveon.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import BMMiner import ipaddress +from pyasic.miners._backends import BMMiner + class Hiveon(BMMiner): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/_types/__init__.py b/pyasic/miners/_types/__init__.py index 55e39857..faf28b41 100644 --- a/pyasic/miners/_types/__init__.py +++ b/pyasic/miners/_types/__init__.py @@ -14,5 +14,5 @@ from .antminer import * from .avalonminer import * -from .whatsminer import * from .innosilicon import * +from .whatsminer import * diff --git a/pyasic/miners/_types/antminer/X17/__init__.py b/pyasic/miners/_types/antminer/X17/__init__.py index 23676727..35c2183e 100644 --- a/pyasic/miners/_types/antminer/X17/__init__.py +++ b/pyasic/miners/_types/antminer/X17/__init__.py @@ -16,7 +16,6 @@ from .S17 import S17 from .S17_Plus import S17Plus from .S17_Pro import S17Pro from .S17e import S17e - from .T17 import T17 from .T17_Plus import T17Plus from .T17e import T17e diff --git a/pyasic/miners/_types/antminer/X19/__init__.py b/pyasic/miners/_types/antminer/X19/__init__.py index 21c9fe21..309871ce 100644 --- a/pyasic/miners/_types/antminer/X19/__init__.py +++ b/pyasic/miners/_types/antminer/X19/__init__.py @@ -14,12 +14,8 @@ from .S19 import S19 from .S19_Pro import S19Pro - +from .S19_XP import S19XP +from .S19a import S19a from .S19j import S19j from .S19j_Pro import S19jPro - -from .S19_XP import S19XP - -from .S19a import S19a - from .T19 import T19 diff --git a/pyasic/miners/_types/whatsminer/M2X/__init__.py b/pyasic/miners/_types/whatsminer/M2X/__init__.py index a8e6637c..c8fbb6f9 100644 --- a/pyasic/miners/_types/whatsminer/M2X/__init__.py +++ b/pyasic/miners/_types/whatsminer/M2X/__init__.py @@ -15,7 +15,6 @@ from .M20 import M20, M20V10 from .M20S import M20S, M20SV10, M20SV20 from .M20S_Plus import M20SPlus - from .M21 import M21 from .M21S import M21S, M21SV20, M21SV60 from .M21S_Plus import M21SPlus diff --git a/pyasic/miners/_types/whatsminer/M3X/__init__.py b/pyasic/miners/_types/whatsminer/M3X/__init__.py index 4955a7aa..0e42bb30 100644 --- a/pyasic/miners/_types/whatsminer/M3X/__init__.py +++ b/pyasic/miners/_types/whatsminer/M3X/__init__.py @@ -12,26 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .M30S import M30S, M30SVE10, M30SVE20, M30SVG20, M30SV50 -from .M30S_Plus import M30SPlus, M30SPlusVG60, M30SPlusVE40, M30SPlusVF20 +from .M30S import M30S, M30SV50, M30SVE10, M30SVE20, M30SVG20 +from .M30S_Plus import M30SPlus, M30SPlusVE40, M30SPlusVF20, M30SPlusVG60 from .M30S_Plus_Plus import ( M30SPlusPlus, M30SPlusPlusVG30, M30SPlusPlusVG40, M30SPlusPlusVH60, ) - from .M31S import M31S from .M31S_Plus import ( M31SPlus, - M31SPlusVE20, M31SPlusV30, M31SPlusV40, - M31SPlusV80, M31SPlusV60, + M31SPlusV80, M31SPlusV90, + M31SPlusVE20, ) - from .M32 import M32, M32V20 from .M32S import M32S from .M34S_Plus import M34SPlus, M34SPlusVE10 diff --git a/pyasic/miners/antminer/bmminer/X17/S17.py b/pyasic/miners/antminer/bmminer/X17/S17.py index 6f03e922..60b9882b 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17.py +++ b/pyasic/miners/antminer/bmminer/X17/S17.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import S17 # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerS17(BMMinerX17, S17): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/S17_Plus.py b/pyasic/miners/antminer/bmminer/X17/S17_Plus.py index 5dd73b4b..23b6ebd1 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17_Plus.py +++ b/pyasic/miners/antminer/bmminer/X17/S17_Plus.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import S17Plus # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerS17Plus(BMMinerX17, S17Plus): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/S17_Pro.py b/pyasic/miners/antminer/bmminer/X17/S17_Pro.py index f44fb2d2..7f5b0ff8 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17_Pro.py +++ b/pyasic/miners/antminer/bmminer/X17/S17_Pro.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import S17Pro # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerS17Pro(BMMinerX17, S17Pro): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/S17e.py b/pyasic/miners/antminer/bmminer/X17/S17e.py index 0d4f841b..e1fcd9e5 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17e.py +++ b/pyasic/miners/antminer/bmminer/X17/S17e.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import S17e # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerS17e(BMMinerX17, S17e): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/T17.py b/pyasic/miners/antminer/bmminer/X17/T17.py index d59e14af..0ff761af 100644 --- a/pyasic/miners/antminer/bmminer/X17/T17.py +++ b/pyasic/miners/antminer/bmminer/X17/T17.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import T17 # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerT17(BMMinerX17, T17): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/T17_Plus.py b/pyasic/miners/antminer/bmminer/X17/T17_Plus.py index f145dc55..5a05992d 100644 --- a/pyasic/miners/antminer/bmminer/X17/T17_Plus.py +++ b/pyasic/miners/antminer/bmminer/X17/T17_Plus.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import T17Plus # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerT17Plus(BMMinerX17, T17Plus): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/T17e.py b/pyasic/miners/antminer/bmminer/X17/T17e.py index 487fa669..d4c53705 100644 --- a/pyasic/miners/antminer/bmminer/X17/T17e.py +++ b/pyasic/miners/antminer/bmminer/X17/T17e.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X17 import BMMinerX17 from pyasic.miners._types import T17e # noqa - Ignore access to _module +from .X17 import BMMinerX17 + class BMMinerT17e(BMMinerX17, T17e): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X17/X17.py b/pyasic/miners/antminer/bmminer/X17/X17.py index fa8ed655..a6f27ad8 100644 --- a/pyasic/miners/antminer/bmminer/X17/X17.py +++ b/pyasic/miners/antminer/bmminer/X17/X17.py @@ -12,12 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module - -from pyasic.settings import PyasicSettings +from typing import Union import httpx -from typing import Union + +from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module +from pyasic.settings import PyasicSettings class BMMinerX17(BMMiner): diff --git a/pyasic/miners/antminer/bmminer/X17/__init__.py b/pyasic/miners/antminer/bmminer/X17/__init__.py index 7b0dc191..52243d56 100644 --- a/pyasic/miners/antminer/bmminer/X17/__init__.py +++ b/pyasic/miners/antminer/bmminer/X17/__init__.py @@ -16,7 +16,6 @@ from .S17 import BMMinerS17 from .S17_Plus import BMMinerS17Plus from .S17_Pro import BMMinerS17Pro from .S17e import BMMinerS17e - from .T17 import BMMinerT17 from .T17_Plus import BMMinerT17Plus from .T17e import BMMinerT17e diff --git a/pyasic/miners/antminer/bmminer/X19/S19.py b/pyasic/miners/antminer/bmminer/X19/S19.py index 2b4964b6..f66d06ac 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19.py +++ b/pyasic/miners/antminer/bmminer/X19/S19.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import S19 # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerS19(BMMinerX19, S19): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/S19_Pro.py b/pyasic/miners/antminer/bmminer/X19/S19_Pro.py index 611ed54c..996568be 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19_Pro.py +++ b/pyasic/miners/antminer/bmminer/X19/S19_Pro.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import S19Pro # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerS19Pro(BMMinerX19, S19Pro): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/S19_XP.py b/pyasic/miners/antminer/bmminer/X19/S19_XP.py index f306d7ee..252df234 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19_XP.py +++ b/pyasic/miners/antminer/bmminer/X19/S19_XP.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import S19XP # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerS19XP(BMMinerX19, S19XP): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/S19a.py b/pyasic/miners/antminer/bmminer/X19/S19a.py index 4d6d2295..87a1b4dc 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19a.py +++ b/pyasic/miners/antminer/bmminer/X19/S19a.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import S19a # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerS19a(BMMinerX19, S19a): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/S19j.py b/pyasic/miners/antminer/bmminer/X19/S19j.py index 42c8a6e2..c69aaa75 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19j.py +++ b/pyasic/miners/antminer/bmminer/X19/S19j.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import S19j # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerS19j(BMMinerX19, S19j): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/S19j_Pro.py b/pyasic/miners/antminer/bmminer/X19/S19j_Pro.py index 961e722a..e049cb35 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19j_Pro.py +++ b/pyasic/miners/antminer/bmminer/X19/S19j_Pro.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import S19jPro # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerS19jPro(BMMinerX19, S19jPro): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/T19.py b/pyasic/miners/antminer/bmminer/X19/T19.py index 85313d4d..ff47f802 100644 --- a/pyasic/miners/antminer/bmminer/X19/T19.py +++ b/pyasic/miners/antminer/bmminer/X19/T19.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .X19 import BMMinerX19 from pyasic.miners._types import T19 # noqa - Ignore access to _module +from .X19 import BMMinerX19 + class BMMinerT19(BMMinerX19, T19): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/antminer/bmminer/X19/X19.py b/pyasic/miners/antminer/bmminer/X19/X19.py index c31a0ff0..c78e9e3d 100644 --- a/pyasic/miners/antminer/bmminer/X19/X19.py +++ b/pyasic/miners/antminer/bmminer/X19/X19.py @@ -12,16 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module - -from pyasic.config import MinerConfig -from pyasic.data.error_codes import X19Error, MinerErrorData -from pyasic.settings import PyasicSettings +import asyncio +import json +from typing import List, Union import httpx -import json -import asyncio -from typing import Union, List + +from pyasic.config import MinerConfig +from pyasic.data.error_codes import MinerErrorData, X19Error +from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module +from pyasic.settings import PyasicSettings class BMMinerX19(BMMiner): diff --git a/pyasic/miners/antminer/bmminer/X19/__init__.py b/pyasic/miners/antminer/bmminer/X19/__init__.py index 6e0303e9..76e7327e 100644 --- a/pyasic/miners/antminer/bmminer/X19/__init__.py +++ b/pyasic/miners/antminer/bmminer/X19/__init__.py @@ -14,12 +14,8 @@ from .S19 import BMMinerS19 from .S19_Pro import BMMinerS19Pro - +from .S19_XP import BMMinerS19XP +from .S19a import BMMinerS19a from .S19j import BMMinerS19j from .S19j_Pro import BMMinerS19jPro - -from .S19_XP import BMMinerS19XP - -from .S19a import BMMinerS19a - from .T19 import BMMinerT19 diff --git a/pyasic/miners/antminer/bosminer/X17/__init__.py b/pyasic/miners/antminer/bosminer/X17/__init__.py index 353ec9d7..2015cba9 100644 --- a/pyasic/miners/antminer/bosminer/X17/__init__.py +++ b/pyasic/miners/antminer/bosminer/X17/__init__.py @@ -16,7 +16,6 @@ from .S17 import BOSMinerS17 from .S17_Plus import BOSMinerS17Plus from .S17_Pro import BOSMinerS17Pro from .S17e import BOSMinerS17e - from .T17 import BOSMinerT17 from .T17_Plus import BOSMinerT17Plus from .T17e import BOSMinerT17e diff --git a/pyasic/miners/antminer/bosminer/X19/__init__.py b/pyasic/miners/antminer/bosminer/X19/__init__.py index 07e42c62..2dcea6f7 100644 --- a/pyasic/miners/antminer/bosminer/X19/__init__.py +++ b/pyasic/miners/antminer/bosminer/X19/__init__.py @@ -14,8 +14,6 @@ from .S19 import BOSMinerS19 from .S19_Pro import BOSMinerS19Pro - from .S19j import BOSMinerS19j from .S19j_Pro import BOSMinerS19jPro - from .T19 import BOSMinerT19 diff --git a/pyasic/miners/antminer/cgminer/X17/__init__.py b/pyasic/miners/antminer/cgminer/X17/__init__.py index a4569c6a..486cc0ff 100644 --- a/pyasic/miners/antminer/cgminer/X17/__init__.py +++ b/pyasic/miners/antminer/cgminer/X17/__init__.py @@ -16,7 +16,6 @@ from .S17 import CGMinerS17 from .S17_Plus import CGMinerS17Plus from .S17_Pro import CGMinerS17Pro from .S17e import CGMinerS17e - from .T17 import CGMinerT17 from .T17_Plus import CGMinerT17Plus from .T17e import CGMinerT17e diff --git a/pyasic/miners/antminer/cgminer/X19/__init__.py b/pyasic/miners/antminer/cgminer/X19/__init__.py index 486b7fbc..da7a1d74 100644 --- a/pyasic/miners/antminer/cgminer/X19/__init__.py +++ b/pyasic/miners/antminer/cgminer/X19/__init__.py @@ -14,8 +14,6 @@ from .S19 import CGMinerS19 from .S19_Pro import CGMinerS19Pro - from .S19j import CGMinerS19j from .S19j_Pro import CGMinerS19jPro - from .T19 import CGMinerT19 diff --git a/pyasic/miners/antminer/hiveon/X9/T9.py b/pyasic/miners/antminer/hiveon/X9/T9.py index 416d1c5d..241438bc 100644 --- a/pyasic/miners/antminer/hiveon/X9/T9.py +++ b/pyasic/miners/antminer/hiveon/X9/T9.py @@ -12,10 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from pyasic.data import HashBoard, MinerData from pyasic.miners._backends import Hiveon # noqa - Ignore access to _module from pyasic.miners._types import T9 # noqa - Ignore access to _module - -from pyasic.data import MinerData, HashBoard from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A1026.py b/pyasic/miners/avalonminer/cgminer/A10X/A1026.py index efe14954..545fad76 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A1026.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A1026.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A10X import CGMinerA10X from pyasic.miners._types import Avalon1026 # noqa - Ignore access to _module +from .A10X import CGMinerA10X + class CGMinerAvalon1026(CGMinerA10X, Avalon1026): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A1047.py b/pyasic/miners/avalonminer/cgminer/A10X/A1047.py index 65e3f638..0d63d3ec 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A1047.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A1047.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A10X import CGMinerA10X from pyasic.miners._types import Avalon1047 # noqa - Ignore access to _module +from .A10X import CGMinerA10X + class CGMinerAvalon1047(CGMinerA10X, Avalon1047): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A1066.py b/pyasic/miners/avalonminer/cgminer/A10X/A1066.py index d8c72c1c..5f3912c1 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A1066.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A1066.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A10X import CGMinerA10X from pyasic.miners._types import Avalon1066 # noqa - Ignore access to _module +from .A10X import CGMinerA10X + class CGMinerAvalon1066(CGMinerA10X, Avalon1066): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A10X.py b/pyasic/miners/avalonminer/cgminer/A10X/A10X.py index 6be3744b..9301dbff 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A10X.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A10X.py @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module - -from pyasic.data import MinerData, HashBoard -from pyasic.settings import PyasicSettings -import re -from pyasic.config import MinerConfig import logging +import re + +from pyasic.config import MinerConfig +from pyasic.data import HashBoard, MinerData +from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module +from pyasic.settings import PyasicSettings class CGMinerA10X(CGMiner): diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A721.py b/pyasic/miners/avalonminer/cgminer/A7X/A721.py index 8d6e44d1..389ceeea 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A721.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A721.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A7X import CGMinerA7X # noqa - Ignore access to _module from pyasic.miners._types import Avalon721 # noqa - Ignore access to _module +from .A7X import CGMinerA7X # noqa - Ignore access to _module + class CGMinerAvalon721(CGMinerA7X, Avalon721): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A741.py b/pyasic/miners/avalonminer/cgminer/A7X/A741.py index b74a4083..4a1dc986 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A741.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A741.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A7X import CGMinerA7X # noqa - Ignore access to _module from pyasic.miners._types import Avalon741 # noqa - Ignore access to _module +from .A7X import CGMinerA7X # noqa - Ignore access to _module + class CGMinerAvalon741(CGMinerA7X, Avalon741): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A761.py b/pyasic/miners/avalonminer/cgminer/A7X/A761.py index 037b83e1..9846f5ec 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A761.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A761.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A7X import CGMinerA7X # noqa - Ignore access to _module from pyasic.miners._types import Avalon761 # noqa - Ignore access to _module +from .A7X import CGMinerA7X # noqa - Ignore access to _module + class CGMinerAvalon761(CGMinerA7X, Avalon761): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A7X.py b/pyasic/miners/avalonminer/cgminer/A7X/A7X.py index c712c91f..91c61fb5 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A7X.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A7X.py @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module - -from pyasic.data import MinerData, HashBoard -from pyasic.settings import PyasicSettings -import re -from pyasic.config import MinerConfig import logging +import re + +from pyasic.config import MinerConfig +from pyasic.data import HashBoard, MinerData +from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module +from pyasic.settings import PyasicSettings class CGMinerA7X(CGMiner): diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A821.py b/pyasic/miners/avalonminer/cgminer/A8X/A821.py index c5931822..162121f1 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A821.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A821.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A8X import CGMinerA8X # noqa - Ignore access to _module from pyasic.miners._types import Avalon821 # noqa - Ignore access to _module +from .A8X import CGMinerA8X # noqa - Ignore access to _module + class CGMinerAvalon821(CGMinerA8X, Avalon821): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A841.py b/pyasic/miners/avalonminer/cgminer/A8X/A841.py index a6a254ea..cc297a5b 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A841.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A841.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A8X import CGMinerA8X # noqa - Ignore access to _module from pyasic.miners._types import Avalon841 # noqa - Ignore access to _module +from .A8X import CGMinerA8X # noqa - Ignore access to _module + class CGMinerAvalon841(CGMinerA8X, Avalon841): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A851.py b/pyasic/miners/avalonminer/cgminer/A8X/A851.py index f7572cac..0ef01f1f 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A851.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A851.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .A8X import CGMinerA8X # noqa - Ignore access to _module from pyasic.miners._types import Avalon851 # noqa - Ignore access to _module +from .A8X import CGMinerA8X # noqa - Ignore access to _module + class CGMinerAvalon851(CGMinerA8X, Avalon851): def __init__(self, ip: str) -> None: diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A8X.py b/pyasic/miners/avalonminer/cgminer/A8X/A8X.py index bc9f220b..0d0d44a4 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A8X.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A8X.py @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module - -from pyasic.data import MinerData, HashBoard -from pyasic.settings import PyasicSettings -import re -from pyasic.config import MinerConfig import logging +import re + +from pyasic.config import MinerConfig +from pyasic.data import HashBoard, MinerData +from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module +from pyasic.settings import PyasicSettings class CGMinerA8X(CGMiner): diff --git a/pyasic/miners/avalonminer/cgminer/A9X/A921.py b/pyasic/miners/avalonminer/cgminer/A9X/A921.py index aa3e2452..77ae0c24 100644 --- a/pyasic/miners/avalonminer/cgminer/A9X/A921.py +++ b/pyasic/miners/avalonminer/cgminer/A9X/A921.py @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +import logging +import re + +from pyasic.config import MinerConfig +from pyasic.data import HashBoard, MinerData from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module from pyasic.miners._types import Avalon921 # noqa - Ignore access to _module - -from pyasic.data import MinerData, HashBoard from pyasic.settings import PyasicSettings -import re -from pyasic.config import MinerConfig -import logging class CGMinerAvalon921(CGMiner, Avalon921): diff --git a/pyasic/miners/base.py b/pyasic/miners/base.py index 915c27f8..88b7be4f 100644 --- a/pyasic/miners/base.py +++ b/pyasic/miners/base.py @@ -12,20 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -import asyncssh -import logging import ipaddress +import logging from abc import ABC, abstractmethod -from typing import TypeVar, List, Union +from typing import List, TypeVar, Union + +import asyncssh -from pyasic.data import MinerData from pyasic.config import MinerConfig +from pyasic.data import MinerData from pyasic.data.error_codes import ( - WhatsminerError, BraiinsOSError, InnosiliconError, - X19Error, MinerErrorData, + WhatsminerError, + X19Error, ) diff --git a/pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py b/pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py index b2e20c8c..67ddb7fc 100644 --- a/pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py +++ b/pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py @@ -12,18 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import InnosiliconT3HPlus # noqa - Ignore access to _module -from pyasic.data import MinerData, HashBoard -from pyasic.data.error_codes import InnosiliconError, MinerErrorData -from pyasic.settings import PyasicSettings -from pyasic.config import MinerConfig -from pyasic.errors import APIError +import logging +import warnings +from typing import List, Union import httpx -import warnings -from typing import Union, List -import logging + +from pyasic.config import MinerConfig +from pyasic.data import HashBoard, MinerData +from pyasic.data.error_codes import InnosiliconError, MinerErrorData +from pyasic.errors import APIError +from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners._types import InnosiliconT3HPlus # noqa - Ignore access to _module +from pyasic.settings import PyasicSettings class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus): diff --git a/pyasic/miners/miner_factory.py b/pyasic/miners/miner_factory.py index e9433267..e43ac25a 100644 --- a/pyasic/miners/miner_factory.py +++ b/pyasic/miners/miner_factory.py @@ -12,38 +12,32 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Tuple, List, Union -from collections.abc import AsyncIterable -from pyasic.miners.base import AnyMiner -import httpx - -from pyasic.miners.antminer import * -from pyasic.miners.avalonminer import * -from pyasic.miners.whatsminer import * -from pyasic.miners.innosilicon import * - -from pyasic.miners._backends.cgminer import CGMiner # noqa - Ignore _module import -from pyasic.miners._backends.bmminer import BMMiner # noqa - Ignore _module import -from pyasic.miners._backends.bosminer import BOSMiner # noqa - Ignore _module import -from pyasic.miners._backends.btminer import BTMiner # noqa - Ignore _module import -from pyasic.miners._backends.bosminer_old import ( # noqa - Ignore _module import - BOSMinerOld, -) - -from pyasic.miners.unknown import UnknownMiner - -from pyasic.errors import APIError - -from pyasic.misc import Singleton - import asyncio import ipaddress import json import logging - -from pyasic.settings import PyasicSettings +from collections.abc import AsyncIterable +from typing import List, Tuple, Union import asyncssh +import httpx + +from pyasic.errors import APIError +from pyasic.miners._backends.bmminer import BMMiner # noqa - Ignore _module import +from pyasic.miners._backends.bosminer import BOSMiner # noqa - Ignore _module import +from pyasic.miners._backends.bosminer_old import ( # noqa - Ignore _module import + BOSMinerOld, +) +from pyasic.miners._backends.btminer import BTMiner # noqa - Ignore _module import +from pyasic.miners._backends.cgminer import CGMiner # noqa - Ignore _module import +from pyasic.miners.antminer import * +from pyasic.miners.avalonminer import * +from pyasic.miners.base import AnyMiner +from pyasic.miners.innosilicon import * +from pyasic.miners.unknown import UnknownMiner +from pyasic.miners.whatsminer import * +from pyasic.misc import Singleton +from pyasic.settings import PyasicSettings MINER_CLASSES = { "ANTMINER S9": { diff --git a/pyasic/miners/unknown.py b/pyasic/miners/unknown.py index 1d211de2..4257b1b7 100644 --- a/pyasic/miners/unknown.py +++ b/pyasic/miners/unknown.py @@ -15,10 +15,10 @@ from typing import List from pyasic.API.unknown import UnknownAPI -from pyasic.miners.base import BaseMiner from pyasic.config import MinerConfig from pyasic.data import MinerData from pyasic.data.error_codes import MinerErrorData +from pyasic.miners.base import BaseMiner class UnknownMiner(BaseMiner): diff --git a/pyasic/miners/whatsminer/btminer/M2X/M20.py b/pyasic/miners/whatsminer/btminer/M2X/M20.py index f3c390cf..ab1e3dd4 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M20.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M20.py @@ -13,10 +13,7 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module - M20, - M20V10, -) +from pyasic.miners._types import M20, M20V10 # noqa - Ignore access to _module class BTMinerM20(BTMiner, M20): diff --git a/pyasic/miners/whatsminer/btminer/M2X/M21S.py b/pyasic/miners/whatsminer/btminer/M2X/M21S.py index 96d4e336..f10aabe4 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M21S.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M21S.py @@ -13,11 +13,11 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( +from pyasic.miners._types import ( # noqa - Ignore access to _module M21S, M21SV20, M21SV60, -) # noqa - Ignore access to _module +) class BTMinerM21S(BTMiner, M21S): diff --git a/pyasic/miners/whatsminer/btminer/M2X/__init__.py b/pyasic/miners/whatsminer/btminer/M2X/__init__.py index 5171f895..5c7e80f4 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/__init__.py +++ b/pyasic/miners/whatsminer/btminer/M2X/__init__.py @@ -15,7 +15,6 @@ from .M20 import BTMinerM20, BTMinerM20V10 from .M20S import BTMinerM20S, BTMinerM20SV10, BTMinerM20SV20 from .M20S_Plus import BTMinerM20SPlus - from .M21 import BTMinerM21 from .M21S import BTMinerM21S, BTMinerM21SV20, BTMinerM21SV60 from .M21S_Plus import BTMinerM21SPlus diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30S.py b/pyasic/miners/whatsminer/btminer/M3X/M30S.py index b917c1b0..83c12a57 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30S.py @@ -13,13 +13,13 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( +from pyasic.miners._types import ( # noqa - Ignore access to _module M30S, M30SV50, - M30SVG20, - M30SVE20, M30SVE10, -) # noqa - Ignore access to _module + M30SVE20, + M30SVG20, +) class BTMinerM30S(BTMiner, M30S): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py index 17e2baad..e66c910e 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py @@ -13,12 +13,12 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( +from pyasic.miners._types import ( # noqa - Ignore access to _module M30SPlus, M30SPlusVE40, M30SPlusVF20, M30SPlusVG60, -) # noqa - Ignore access to _module +) class BTMinerM30SPlus(BTMiner, M30SPlus): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py index d232c440..7bcee9d2 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py @@ -15,8 +15,8 @@ from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module from pyasic.miners._types import ( # noqa - Ignore access to _module M30SPlusPlus, - M30SPlusPlusVG40, M30SPlusPlusVG30, + M30SPlusPlusVG40, M30SPlusPlusVH60, ) diff --git a/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py index 142be4a8..77a8ef88 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py @@ -13,15 +13,15 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( +from pyasic.miners._types import ( # noqa - Ignore access to _module M31SPlus, - M31SPlusVE20, M31SPlusV30, M31SPlusV40, M31SPlusV60, M31SPlusV80, M31SPlusV90, -) # noqa - Ignore access to _module + M31SPlusVE20, +) class BTMinerM31SPlus(BTMiner, M31SPlus): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M32S.py b/pyasic/miners/whatsminer/btminer/M3X/M32S.py index 8f19a9a4..06fbbfb8 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M32S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M32S.py @@ -13,9 +13,7 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( - M32S, -) # noqa - Ignore access to _module +from pyasic.miners._types import M32S # noqa - Ignore access to _module class BTMinerM32S(BTMiner, M32S): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py index af65a3a2..d5c4f045 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py @@ -13,10 +13,10 @@ # limitations under the License. from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( +from pyasic.miners._types import ( # noqa - Ignore access to _module M34SPlus, M34SPlusVE10, -) # noqa - Ignore access to _module +) class BTMinerM34SPlus(BTMiner, M34SPlus): diff --git a/pyasic/miners/whatsminer/btminer/M3X/__init__.py b/pyasic/miners/whatsminer/btminer/M3X/__init__.py index a09eb79d..6204adbe 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/__init__.py +++ b/pyasic/miners/whatsminer/btminer/M3X/__init__.py @@ -14,35 +14,33 @@ from .M30S import ( BTMinerM30S, + BTMinerM30SV50, BTMinerM30SVE10, BTMinerM30SVE20, BTMinerM30SVG20, - BTMinerM30SV50, ) from .M30S_Plus import ( BTMinerM30SPlus, - BTMinerM30SPlusVF20, BTMinerM30SPlusVE40, + BTMinerM30SPlusVF20, BTMinerM30SPlusVG60, ) from .M30S_Plus_Plus import ( BTMinerM30SPlusPlus, - BTMinerM30SPlusPlusVG40, BTMinerM30SPlusPlusVG30, + BTMinerM30SPlusPlusVG40, BTMinerM30SPlusPlusVH60, ) - from .M31S import BTMinerM31S from .M31S_Plus import ( BTMinerM31SPlus, - BTMinerM31SPlusVE20, BTMinerM31SPlusV30, BTMinerM31SPlusV40, BTMinerM31SPlusV60, BTMinerM31SPlusV80, BTMinerM31SPlusV90, + BTMinerM31SPlusVE20, ) - from .M32 import BTMinerM32, BTMinerM32V20 from .M32S import BTMinerM32S from .M34S_Plus import BTMinerM34SPlus, BTMinerM34SPlusVE10 diff --git a/pyasic/miners/whatsminer/btminer/M5X/__init__.py b/pyasic/miners/whatsminer/btminer/M5X/__init__.py index f1bb1890..ccac2c77 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/__init__.py +++ b/pyasic/miners/whatsminer/btminer/M5X/__init__.py @@ -12,7 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .M50 import ( - BTMinerM50, - BTMinerM50VH50, -) +from .M50 import BTMinerM50, BTMinerM50VH50 diff --git a/pyasic/network/__init__.py b/pyasic/network/__init__.py index e7a00f71..3cb1891b 100644 --- a/pyasic/network/__init__.py +++ b/pyasic/network/__init__.py @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import ipaddress import asyncio +import ipaddress import logging -from typing import Union, List, AsyncIterator +from typing import AsyncIterator, List, Union +from pyasic.miners.miner_factory import AnyMiner, MinerFactory from pyasic.network.net_range import MinerNetworkRange -from pyasic.miners.miner_factory import MinerFactory, AnyMiner from pyasic.settings import PyasicSettings diff --git a/pyasic/network/net_range.py b/pyasic/network/net_range.py index 73cc86f5..b70579d8 100644 --- a/pyasic/network/net_range.py +++ b/pyasic/network/net_range.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Union import ipaddress +from typing import Union class MinerNetworkRange: diff --git a/tests/__init__.py b/tests/__init__.py index 33697bd9..7347f1f9 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -13,9 +13,10 @@ # limitations under the License. import unittest -from tests.miners_tests import MinersTest, MinerFactoryTest -from tests.network_tests import NetworkTest + from tests.config_tests import ConfigTest +from tests.miners_tests import MinerFactoryTest, MinersTest +from tests.network_tests import NetworkTest if __name__ == "__main__": # `coverage run --source pyasic -m unittest discover` will give code coverage data diff --git a/tests/config_tests/__init__.py b/tests/config_tests/__init__.py index b8c7ae8e..24e9122e 100644 --- a/tests/config_tests/__init__.py +++ b/tests/config_tests/__init__.py @@ -13,14 +13,15 @@ # limitations under the License. import unittest -from pyasic.config import MinerConfig, _PoolGroup, _Pool # noqa from tests.test_data import ( bosminer_api_pools, + bosminer_config_pools, x19_api_pools, x19_web_pools, - bosminer_config_pools, ) +from pyasic.config import MinerConfig, _Pool, _PoolGroup # noqa + class ConfigTest(unittest.TestCase): def setUp(self) -> None: diff --git a/tests/miners_tests/__init__.py b/tests/miners_tests/__init__.py index 34b1a2f3..12948d08 100644 --- a/tests/miners_tests/__init__.py +++ b/tests/miners_tests/__init__.py @@ -11,18 +11,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import unittest - -from pyasic.miners.miner_factory import MINER_CLASSES -from pyasic.miners.base import BaseMiner -from pyasic.miners._backends import CGMiner -from pyasic.miners.miner_factory import MinerFactory -from pyasic.miners.miner_listener import MinerListener - import asyncio - import inspect import sys +import unittest + +from pyasic.miners._backends import CGMiner +from pyasic.miners.base import BaseMiner +from pyasic.miners.miner_factory import MINER_CLASSES, MinerFactory +from pyasic.miners.miner_listener import MinerListener class MinersTest(unittest.TestCase): diff --git a/tests/network_tests/__init__.py b/tests/network_tests/__init__.py index b4500951..c3a85856 100644 --- a/tests/network_tests/__init__.py +++ b/tests/network_tests/__init__.py @@ -15,8 +15,8 @@ import ipaddress import unittest -from pyasic.network.net_range import MinerNetworkRange from pyasic.network import MinerNetwork +from pyasic.network.net_range import MinerNetworkRange class NetworkTest(unittest.TestCase):