From 1d67e5ed68c4ea4b7c43eb9bef32bb940d7251d1 Mon Sep 17 00:00:00 2001 From: Upstream Data Date: Wed, 1 May 2024 14:29:02 -0600 Subject: [PATCH] refactor: clean and optimize imports. --- pyasic/miners/backends/antminer.py | 2 -- pyasic/miners/backends/auradine.py | 1 - pyasic/miners/backends/avalonminer.py | 1 - pyasic/miners/backends/bfgminer.py | 1 - pyasic/miners/backends/bmminer.py | 1 - pyasic/miners/backends/braiins_os.py | 1 - pyasic/miners/backends/btminer.py | 1 - pyasic/miners/backends/cgminer.py | 1 - pyasic/miners/backends/epic.py | 1 - pyasic/miners/backends/goldshell.py | 1 - pyasic/miners/backends/innosilicon.py | 1 - pyasic/miners/backends/luxminer.py | 1 - pyasic/miners/backends/marathon.py | 3 +-- pyasic/web/__init__.py | 3 +-- tests/__init__.py | 2 +- 15 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pyasic/miners/backends/antminer.py b/pyasic/miners/backends/antminer.py index 6a2532d2..1cf695fc 100644 --- a/pyasic/miners/backends/antminer.py +++ b/pyasic/miners/backends/antminer.py @@ -22,7 +22,6 @@ from pyasic.data.error_codes import MinerErrorData, X19Error from pyasic.errors import APIError from pyasic.miners.backends.bmminer import BMMiner from pyasic.miners.backends.cgminer import CGMiner -from pyasic.miners.base import BaseMiner from pyasic.miners.data import ( DataFunction, DataLocations, @@ -30,7 +29,6 @@ from pyasic.miners.data import ( RPCAPICommand, WebAPICommand, ) -from pyasic.miners.device.firmware import StockFirmware from pyasic.rpc.antminer import AntminerRPCAPI from pyasic.ssh.antminer import AntminerModernSSH from pyasic.web.antminer import AntminerModernWebAPI, AntminerOldWebAPI diff --git a/pyasic/miners/backends/auradine.py b/pyasic/miners/backends/auradine.py index c0585146..76281159 100644 --- a/pyasic/miners/backends/auradine.py +++ b/pyasic/miners/backends/auradine.py @@ -20,7 +20,6 @@ from typing import List, Optional from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import ( DataFunction, DataLocations, diff --git a/pyasic/miners/backends/avalonminer.py b/pyasic/miners/backends/avalonminer.py index 47d0b4d2..58e11acf 100644 --- a/pyasic/miners/backends/avalonminer.py +++ b/pyasic/miners/backends/avalonminer.py @@ -21,7 +21,6 @@ from pyasic.data import Fan, HashBoard from pyasic.errors import APIError from pyasic.miners.backends.cgminer import CGMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand -from pyasic.miners.device.firmware import StockFirmware AVALON_DATA_LOC = DataLocations( **{ diff --git a/pyasic/miners/backends/bfgminer.py b/pyasic/miners/backends/bfgminer.py index 56f9ad84..8d33b758 100644 --- a/pyasic/miners/backends/bfgminer.py +++ b/pyasic/miners/backends/bfgminer.py @@ -19,7 +19,6 @@ from typing import List, Optional from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand from pyasic.miners.device.firmware import StockFirmware from pyasic.rpc.bfgminer import BFGMinerRPCAPI diff --git a/pyasic/miners/backends/bmminer.py b/pyasic/miners/backends/bmminer.py index 8ade648e..e8fa7d19 100644 --- a/pyasic/miners/backends/bmminer.py +++ b/pyasic/miners/backends/bmminer.py @@ -19,7 +19,6 @@ from typing import List, Optional from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand from pyasic.miners.device.firmware import StockFirmware from pyasic.rpc.bmminer import BMMinerRPCAPI diff --git a/pyasic/miners/backends/braiins_os.py b/pyasic/miners/backends/braiins_os.py index 68f15963..147a3acd 100644 --- a/pyasic/miners/backends/braiins_os.py +++ b/pyasic/miners/backends/braiins_os.py @@ -24,7 +24,6 @@ from pyasic.config.mining import MiningModePowerTune from pyasic.data import Fan, HashBoard from pyasic.data.error_codes import BraiinsOSError, MinerErrorData from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import ( DataFunction, DataLocations, diff --git a/pyasic/miners/backends/btminer.py b/pyasic/miners/backends/btminer.py index 83adf27a..b7565258 100644 --- a/pyasic/miners/backends/btminer.py +++ b/pyasic/miners/backends/btminer.py @@ -21,7 +21,6 @@ from pyasic.config import MinerConfig, MiningModeConfig from pyasic.data import Fan, HashBoard from pyasic.data.error_codes import MinerErrorData, WhatsminerError from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand from pyasic.miners.device.firmware import StockFirmware from pyasic.rpc.btminer import BTMinerRPCAPI diff --git a/pyasic/miners/backends/cgminer.py b/pyasic/miners/backends/cgminer.py index 8005bf6a..687ecc3b 100644 --- a/pyasic/miners/backends/cgminer.py +++ b/pyasic/miners/backends/cgminer.py @@ -18,7 +18,6 @@ from typing import Optional from pyasic.config import MinerConfig from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand from pyasic.miners.device.firmware import StockFirmware from pyasic.rpc.cgminer import CGMinerRPCAPI diff --git a/pyasic/miners/backends/epic.py b/pyasic/miners/backends/epic.py index a998be8b..ec0f4fb3 100644 --- a/pyasic/miners/backends/epic.py +++ b/pyasic/miners/backends/epic.py @@ -21,7 +21,6 @@ from pyasic.data import Fan, HashBoard from pyasic.data.error_codes import MinerErrorData, X19Error from pyasic.errors import APIError from pyasic.logger import logger -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand from pyasic.miners.device.firmware import ePICFirmware from pyasic.web.epic import ePICWebAPI diff --git a/pyasic/miners/backends/goldshell.py b/pyasic/miners/backends/goldshell.py index a37eed42..c6159db3 100644 --- a/pyasic/miners/backends/goldshell.py +++ b/pyasic/miners/backends/goldshell.py @@ -27,7 +27,6 @@ from pyasic.miners.data import ( RPCAPICommand, WebAPICommand, ) -from pyasic.miners.device.firmware import StockFirmware from pyasic.web.goldshell import GoldshellWebAPI GOLDSHELL_DATA_LOC = DataLocations( diff --git a/pyasic/miners/backends/innosilicon.py b/pyasic/miners/backends/innosilicon.py index 858a8ba0..d806aa15 100644 --- a/pyasic/miners/backends/innosilicon.py +++ b/pyasic/miners/backends/innosilicon.py @@ -28,7 +28,6 @@ from pyasic.miners.data import ( RPCAPICommand, WebAPICommand, ) -from pyasic.miners.device.firmware import StockFirmware from pyasic.web.innosilicon import InnosiliconWebAPI INNOSILICON_DATA_LOC = DataLocations( diff --git a/pyasic/miners/backends/luxminer.py b/pyasic/miners/backends/luxminer.py index eb8fdfbd..e0faed20 100644 --- a/pyasic/miners/backends/luxminer.py +++ b/pyasic/miners/backends/luxminer.py @@ -18,7 +18,6 @@ from typing import List, Optional from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand from pyasic.miners.device.firmware import LuxOSFirmware from pyasic.rpc.luxminer import LUXMinerRPCAPI diff --git a/pyasic/miners/backends/marathon.py b/pyasic/miners/backends/marathon.py index 97ec25ec..4b60daa3 100644 --- a/pyasic/miners/backends/marathon.py +++ b/pyasic/miners/backends/marathon.py @@ -4,9 +4,8 @@ from pyasic import MinerConfig from pyasic.config import MiningModeConfig from pyasic.data import Fan, HashBoard from pyasic.errors import APIError -from pyasic.miners.base import BaseMiner from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand -from pyasic.miners.device.firmware import MaraFirmware, StockFirmware +from pyasic.miners.device.firmware import MaraFirmware from pyasic.misc import merge_dicts from pyasic.web.marathon import MaraWebAPI diff --git a/pyasic/web/__init__.py b/pyasic/web/__init__.py index bc47f6ad..5e030e65 100644 --- a/pyasic/web/__init__.py +++ b/pyasic/web/__init__.py @@ -13,10 +13,9 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .base import BaseWebAPI - from .antminer import AntminerModernWebAPI, AntminerOldWebAPI from .auradine import AuradineWebAPI +from .base import BaseWebAPI from .braiins_os import BOSerWebAPI, BOSMinerWebAPI from .epic import ePICWebAPI from .goldshell import GoldshellWebAPI diff --git a/tests/__init__.py b/tests/__init__.py index cdbcd3d3..b073a7c0 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -14,10 +14,10 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from tests.rpc_tests import * from tests.config_tests import TestConfig from tests.miners_tests import MinersTest from tests.network_tests import NetworkTest +from tests.rpc_tests import * if __name__ == "__main__": # `coverage run --source pyasic -m unittest discover` will give code coverage data