refactor: refactor miner types.

pyasic/load/__init__.py

@@ -19,21 +19,8 @@ from typing import List, Union
 
 from pyasic.errors import APIError
 from pyasic.miners import AnyMiner
-from pyasic.miners.backends import (  # noqa - Ignore access to _module
-    AntminerModern,
-    BOSMiner,
-    BTMiner,
-)
-from pyasic.miners.btc._types import (  # noqa - Ignore access to _module
-    S9,
-    S17,
-    T17,
-    S17e,
-    S17Plus,
-    S17Pro,
-    T17e,
-    T17Plus,
-)
+from pyasic.miners.backends import AntminerModern, BOSMiner, BTMiner
+from pyasic.miners.types import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus
 
 FAN_USAGE = 50  # 50 W per fan
 

pyasic/miners/antminer/bmminer/X17/S17.py

@@ -14,15 +14,21 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19j, S19jNoPIC  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
 
 
-class BMMinerS19j(AntminerModern, S19j):
+class BMMinerS17(AntminerOld, S17):
     pass
 
 
-class BMMinerS19jNoPIC(AntminerModern, S19jNoPIC):
+class BMMinerS17Plus(AntminerOld, S17Plus):
+    pass
+
+
+class BMMinerS17Pro(AntminerOld, S17Pro):
+    pass
+
+
+class BMMinerS17e(AntminerOld, S17e):
     pass

pyasic/miners/antminer/bmminer/X17/T17.py

@@ -15,9 +15,16 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.ltc._types import L3Plus  # noqa - Ignore access to _module
+from pyasic.miners.types import T17, T17e, T17Plus
 
 
-class BMMinerL3Plus(AntminerOld, L3Plus):
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
+class BMMinerT17(AntminerOld, T17):
+    pass
+
+
+class BMMinerT17Plus(AntminerOld, T17Plus):
+    pass
+
+
+class BMMinerT17e(AntminerOld, T17e):
+    pass

pyasic/miners/antminer/bmminer/X17/__init__.py

@@ -0,0 +1,18 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  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.                                              -
+# ------------------------------------------------------------------------------
+
+from .S17 import BMMinerS17, BMMinerS17e, BMMinerS17Plus, BMMinerS17Pro
+from .T17 import BMMinerT17, BMMinerT17e, BMMinerT17Plus

pyasic/miners/antminer/bmminer/X19/S19.py

@@ -15,8 +15,55 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19ProPlus  # noqa - Ignore access to _module
+from pyasic.miners.types import (
+    S19,
+    S19L,
+    S19XP,
+    S19a,
+    S19aPro,
+    S19j,
+    S19jNoPIC,
+    S19jPro,
+    S19Pro,
+    S19ProPlus,
+)
+
+
+class BMMinerS19(AntminerModern, S19):
+    pass
+
+
+class BMMinerS19Pro(AntminerModern, S19Pro):
+    pass
 
 
 class BMMinerS19ProPlus(AntminerModern, S19ProPlus):
     pass
+
+
+class BMMinerS19XP(AntminerModern, S19XP):
+    pass
+
+
+class BMMinerS19a(AntminerModern, S19a):
+    pass
+
+
+class BMMinerS19aPro(AntminerModern, S19aPro):
+    pass
+
+
+class BMMinerS19j(AntminerModern, S19j):
+    pass
+
+
+class BMMinerS19jNoPIC(AntminerModern, S19jNoPIC):
+    pass
+
+
+class BMMinerS19jPro(AntminerModern, S19jPro):
+    pass
+
+
+class BMMinerS19L(AntminerModern, S19L):
+    pass

pyasic/miners/antminer/bmminer/X19/T19.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import T19  # noqa - Ignore access to _module
+from pyasic.miners.types import T19
 
 # noqa - Ignore access to _module
 

pyasic/miners/antminer/bmminer/X19/__init__.py

@@ -14,10 +14,16 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-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
+from .S19 import (
+    BMMinerS19,
+    BMMinerS19a,
+    BMMinerS19aPro,
+    BMMinerS19j,
+    BMMinerS19jNoPIC,
+    BMMinerS19jPro,
+    BMMinerS19L,
+    BMMinerS19Pro,
+    BMMinerS19ProPlus,
+    BMMinerS19XP,
+)
+from .T19 import BMMinerT19

pyasic/miners/antminer/bmminer/X3/HS3.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.hns._types import HS3  # noqa - Ignore access to _module
+from pyasic.miners.types import HS3
 
 
 class BMMinerHS3(AntminerModern, HS3):

pyasic/miners/antminer/bmminer/X3/L3.py

@@ -14,8 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import CGMinerAvalon  # noqa - Ignore access to _module
+from pyasic.miners.backends import AntminerOld
+from pyasic.miners.types import L3Plus
 
 
-class CGMinerA12X(CGMinerAvalon):
+class BMMinerL3Plus(AntminerOld, L3Plus):
     pass

pyasic/miners/antminer/bmminer/X3/__init__.py

@@ -14,3 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from .HS3 import BMMinerHS3
+from .L3 import BMMinerL3Plus

pyasic/miners/antminer/bmminer/X7/L7.py

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.ltc._types import L7  # noqa - Ignore access to _module
+from pyasic.miners.types import L7
 
 
 class BMMinerL7(AntminerModern, L7):

pyasic/miners/antminer/bmminer/X9/E9.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.etc._types import E9Pro  # noqa - Ignore access to _module
+from pyasic.miners.types import E9Pro
 
 
 class BMMinerE9Pro(AntminerModern, E9Pro):

pyasic/miners/antminer/bmminer/X9/S9.py

@@ -15,8 +15,16 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BMMiner
-from pyasic.miners.btc._types import S9i  # noqa - Ignore access to _module
+from pyasic.miners.types import S9, S9i, S9j
+
+
+class BMMinerS9(BMMiner, S9):
+    pass
 
 
 class BMMinerS9i(BMMiner, S9i):
     pass
+
+
+class BMMinerS9j(BMMiner, S9j):
+    pass

pyasic/miners/antminer/bmminer/X9/T9.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BMMiner
-from pyasic.miners.btc._types import T9  # noqa - Ignore access to _module
+from pyasic.miners.types import T9
 
 
 class BMMinerT9(BMMiner, T9):

pyasic/miners/antminer/bmminer/X9/__init__.py

@@ -14,7 +14,6 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S9 import BMMinerS9
-from .S9i import BMMinerS9i
-from .S9j import BMMinerS9j
+from .E9 import BMMinerE9Pro
+from .S9 import BMMinerS9, BMMinerS9i, BMMinerS9j
 from .T9 import BMMinerT9

pyasic/miners/antminer/bmminer/__init__.py

@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from .X3 import *
+from .X7 import *
 from .X9 import *
 from .X17 import *
 from .X19 import *

pyasic/miners/antminer/bosminer/X17/S17.py

@@ -15,8 +15,20 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.btc._types import S17Plus  # noqa - Ignore access to _module
+from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
+
+
+class BOSMinerS17(BOSMiner, S17):
+    pass
 
 
 class BOSMinerS17Plus(BOSMiner, S17Plus):
     pass
+
+
+class BOSMinerS17Pro(BOSMiner, S17Pro):
+    pass
+
+
+class BOSMinerS17e(BOSMiner, S17e):
+    pass

pyasic/miners/antminer/bosminer/X17/T17.py

@@ -15,8 +15,16 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.btc._types import T17Plus  # noqa - Ignore access to _module
+from pyasic.miners.types import T17, T17e, T17Plus
+
+
+class BOSMinerT17(BOSMiner, T17):
+    pass
 
 
 class BOSMinerT17Plus(BOSMiner, T17Plus):
     pass
+
+
+class BOSMinerT17e(BOSMiner, T17e):
+    pass

pyasic/miners/antminer/bosminer/X17/__init__.py

@@ -0,0 +1,18 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  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.                                              -
+# ------------------------------------------------------------------------------
+
+from .S17 import BOSMinerS17, BOSMinerS17e, BOSMinerS17Plus, BOSMinerS17Pro
+from .T17 import BOSMinerT17, BOSMinerT17e, BOSMinerT17Plus

pyasic/miners/antminer/bosminer/X19/S19.py

@@ -15,7 +15,15 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.btc._types import S19j, S19jNoPIC  # noqa - Ignore access to _module
+from pyasic.miners.types import S19, S19j, S19jNoPIC, S19jPro, S19Pro
+
+
+class BOSMinerS19(BOSMiner, S19):
+    pass
+
+
+class BOSMinerS19Pro(BOSMiner, S19Pro):
+    pass
 
 
 class BOSMinerS19j(BOSMiner, S19j):
@@ -24,3 +32,7 @@ class BOSMinerS19j(BOSMiner, S19j):
 
 class BOSMinerS19jNoPIC(BOSMiner, S19jNoPIC):
     pass
+
+
+class BOSMinerS19jPro(BOSMiner, S19jPro):
+    pass

pyasic/miners/antminer/bosminer/X19/T19.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.btc._types import T19  # noqa - Ignore access to _module
+from pyasic.miners.types import T19
 
 
 class BOSMinerT19(BOSMiner, T19):

pyasic/miners/antminer/bosminer/X19/__init__.py

@@ -0,0 +1,24 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  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.                                              -
+# ------------------------------------------------------------------------------
+
+from .S19 import (
+    BOSMinerS19,
+    BOSMinerS19j,
+    BOSMinerS19jNoPIC,
+    BOSMinerS19jPro,
+    BOSMinerS19Pro,
+)
+from .T19 import BOSMinerT19

pyasic/miners/antminer/bosminer/X9/S9.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.btc._types import S9  # noqa - Ignore access to _module
+from pyasic.miners.types import S9
 
 
 class BOSMinerS9(BOSMiner, S9):

pyasic/miners/antminer/cgminer/X15/Z15.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.zec._types import Z15  # noqa - Ignore access to _module
+from pyasic.miners.types import Z15
 
 
 class CGMinerZ15(AntminerOld, Z15):

pyasic/miners/antminer/cgminer/X3/D3.py

@@ -13,9 +13,8 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.dsh._types import D3  # noqa - Ignore access to _module
+from pyasic.miners.types import D3
 
 
 class CGMinerD3(AntminerOld, D3):

pyasic/miners/antminer/cgminer/X3/__init__.py

@@ -13,4 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+
 from .D3 import CGMinerD3

pyasic/miners/antminer/cgminer/X5/DR5.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.dcr._types import DR5  # noqa - Ignore access to _module
+from pyasic.miners.types import DR5
 
 
 class CGMinerDR5(AntminerOld, DR5):

pyasic/miners/antminer/cgminer/__init__.py

@@ -13,4 +13,7 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+
+from .X3 import *
+from .X5 import *
 from .X15 import *

pyasic/miners/antminer/hiveon/X9/T9.py

@@ -20,8 +20,8 @@ import asyncssh
 
 from pyasic.data import HashBoard
 from pyasic.errors import APIError
-from pyasic.miners.backends import Hiveon  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import T9  # noqa - Ignore access to _module
+from pyasic.miners.backends import Hiveon
+from pyasic.miners.types import T9
 
 
 class HiveonT9(Hiveon, T9):

pyasic/miners/antminer/vnish/X19/S19.py

@@ -14,8 +14,32 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import VNish  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import S19jPro  # noqa - Ignore access to _module
+from pyasic.miners.backends import VNish
+from pyasic.miners.types import S19, S19XP, S19a, S19aPro, S19j, S19jPro, S19Pro
+
+
+class VNishS19(VNish, S19):
+    pass
+
+
+class VNishS19Pro(VNish, S19Pro):
+    pass
+
+
+class VNishS19XP(VNish, S19XP):
+    pass
+
+
+class VNishS19a(VNish, S19a):
+    pass
+
+
+class VNishS19aPro(VNish, S19aPro):
+    pass
+
+
+class VNishS19j(VNish, S19j):
+    pass
 
 
 class VNishS19jPro(VNish, S19jPro):

pyasic/miners/antminer/vnish/X19/T19.py

@@ -14,8 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import CGMinerAvalon  # noqa - Ignore access to _module
+from pyasic.miners.backends import VNish
+from pyasic.miners.types import T19
 
 
-class CGMinerA7X(CGMinerAvalon):
+class VNishT19(VNish, T19):
     pass

pyasic/miners/antminer/vnish/X19/__init__.py

@@ -0,0 +1,26 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  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.                                              -
+# ------------------------------------------------------------------------------
+
+from .S19 import (
+    VNishS19,
+    VNishS19a,
+    VNishS19aPro,
+    VNishS19j,
+    VNishS19jPro,
+    VNishS19Pro,
+    VNishS19XP,
+)
+from .T19 import VNishT19

pyasic/miners/antminer/vnish/X3/L3.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import VNish
-from pyasic.miners.ltc._types import L3Plus  # noqa - Ignore access to _module
+from pyasic.miners.types import L3Plus
 
 
 class VnishL3Plus(VNish, L3Plus):

pyasic/miners/antminer/vnish/X3/__init__.py

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .T3X import *
+from .L3 import VnishL3Plus

pyasic/miners/antminer/vnish/__init__.py

@@ -14,4 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
+from .X3 import *
 from .X19 import *

pyasic/miners/avalonminer/cgminer/A10X/A1026.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon1026  # noqa - Ignore access to _module
-
-from .A10X import CGMinerA10X
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1026
 
 
-class CGMinerAvalon1026(CGMinerA10X, Avalon1026):
+class CGMinerAvalon1026(CGMinerAvalon, Avalon1026):
     pass

pyasic/miners/avalonminer/cgminer/A10X/A1047.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon1047  # noqa - Ignore access to _module
-
-from .A10X import CGMinerA10X
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1047
 
 
-class CGMinerAvalon1047(CGMinerA10X, Avalon1047):
+class CGMinerAvalon1047(CGMinerAvalon, Avalon1047):
     pass

pyasic/miners/avalonminer/cgminer/A10X/A1066.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon1066  # noqa - Ignore access to _module
-
-from .A10X import CGMinerA10X
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1066
 
 
-class CGMinerAvalon1066(CGMinerA10X, Avalon1066):
+class CGMinerAvalon1066(CGMinerAvalon, Avalon1066):
     pass

pyasic/miners/avalonminer/cgminer/A11X/A1166.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon1166Pro  # noqa
-
-from .A11X import CGMinerA11X
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1166Pro
 
 
-class CGMinerAvalon1166Pro(CGMinerA11X, Avalon1166Pro):
+class CGMinerAvalon1166Pro(CGMinerAvalon, Avalon1166Pro):
     pass

pyasic/miners/avalonminer/cgminer/A12X/A1246.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon1246
-
-from .A12X import CGMinerA12X
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon1246
 
 
-class CGMinerAvalon1246(CGMinerA12X, Avalon1246):
+class CGMinerAvalon1246(CGMinerAvalon, Avalon1246):
     pass

pyasic/miners/avalonminer/cgminer/A7X/A721.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon721  # noqa - Ignore access to _module
-
-from .A7X import CGMinerA7X  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon721
 
 
-class CGMinerAvalon721(CGMinerA7X, Avalon721):
+class CGMinerAvalon721(CGMinerAvalon, Avalon721):
     pass

pyasic/miners/avalonminer/cgminer/A7X/A741.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon741  # noqa - Ignore access to _module
-
-from .A7X import CGMinerA7X  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon741
 
 
-class CGMinerAvalon741(CGMinerA7X, Avalon741):
+class CGMinerAvalon741(CGMinerAvalon, Avalon741):
     pass

pyasic/miners/avalonminer/cgminer/A7X/A761.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon761  # noqa - Ignore access to _module
-
-from .A7X import CGMinerA7X  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon761
 
 
-class CGMinerAvalon761(CGMinerA7X, Avalon761):
+class CGMinerAvalon761(CGMinerAvalon, Avalon761):
     pass

pyasic/miners/avalonminer/cgminer/A8X/A821.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon821  # noqa - Ignore access to _module
-
-from .A8X import CGMinerA8X  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon821
 
 
-class CGMinerAvalon821(CGMinerA8X, Avalon821):
+class CGMinerAvalon821(CGMinerAvalon, Avalon821):
     pass

pyasic/miners/avalonminer/cgminer/A8X/A841.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon841  # noqa - Ignore access to _module
-
-from .A8X import CGMinerA8X  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon841
 
 
-class CGMinerAvalon841(CGMinerA8X, Avalon841):
+class CGMinerAvalon841(CGMinerAvalon, Avalon841):
     pass

pyasic/miners/avalonminer/cgminer/A8X/A851.py

@@ -14,10 +14,9 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.btc._types import Avalon851  # noqa - Ignore access to _module
-
-from .A8X import CGMinerA8X  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon851
 
 
-class CGMinerAvalon851(CGMinerA8X, Avalon851):
+class CGMinerAvalon851(CGMinerAvalon, Avalon851):
     pass

pyasic/miners/avalonminer/cgminer/A9X/A921.py

@@ -14,8 +14,8 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import CGMinerAvalon  # noqa - Ignore access to _module
-from pyasic.miners.btc._types import Avalon921  # noqa - Ignore access to _module
+from pyasic.miners.backends import CGMinerAvalon
+from pyasic.miners.types import Avalon921
 
 
 class CGMinerAvalon921(CGMinerAvalon, Avalon921):

pyasic/miners/btc/__init__.py

@@ -1,19 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-from .antminer import *
-from .avalonminer import *
-from .innosilicon import *
-from .whatsminer import *

pyasic/miners/btc/_types/antminer/X17/S17.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S17(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S17"
-        self.nominal_chips = 48
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X17/S17_Plus.py

@@ -1,25 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S17Plus(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.model = "S17+"
-        self.nominal_chips = 65
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X17/S17e.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S17e(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S17e"
-        self.nominal_chips = 135
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X17/T17.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class T17(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "T17"
-        self.nominal_chips = 30
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X17/T17_Plus.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class T17Plus(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "T17+"
-        self.nominal_chips = 44
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X17/T17e.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class T17e(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "T17e"
-        self.nominal_chips = 78
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19"
-        self.nominal_chips = 76
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19L.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19L(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19L"
-        self.nominal_chips = 76
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19_Pro.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19Pro(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19 Pro"
-        self.nominal_chips = 114
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19_Pro_Plus.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19ProPlus(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19 Pro+"
-        self.nominal_chips = 120
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19_XP.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19XP(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19 XP"
-        self.nominal_chips = 110
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19a.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19a(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19a"
-        self.nominal_chips = 72
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19aPro(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19a Pro"
-        self.nominal_chips = 100
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S19jPro(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S19j Pro"
-        self.nominal_chips = 126
-        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/__init__.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from .S19 import S19
-from .S19_Pro import S19Pro
-from .S19_Pro_Plus import S19ProPlus
-from .S19_XP import S19XP
-from .S19a import S19a
-from .S19a_Pro import S19aPro
-from .S19j import S19j, S19jNoPIC
-from .S19j_Pro import S19jPro
-from .S19L import S19L
-from .T19 import T19

pyasic/miners/btc/_types/antminer/X9/S9.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S9(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S9"
-        self.nominal_chips = 63
-        self.fan_count = 2

pyasic/miners/btc/_types/antminer/X9/S9j.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.makes import AntMiner
-
-
-class S9j(AntMiner):  # noqa - ignore ABC method implementation
-    def __init__(self, ip: str, api_ver: str = "0.0.0"):
-        super().__init__(ip, api_ver)
-        self.ip = ip
-        self.model = "S9j"
-        self.nominal_chips = 63
-        self.fan_count = 2

pyasic/miners/btc/_types/antminer/__init__.py

@@ -1,18 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-from .X9 import *
-from .X17 import *
-from .X19 import *

pyasic/miners/btc/antminer/bmminer/X17/S17.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import S17  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerS17(BMMinerX17, S17):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import S17Plus  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerS17Plus(BMMinerX17, S17Plus):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import S17Pro  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerS17Pro(BMMinerX17, S17Pro):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/S17e.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import S17e  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerS17e(BMMinerX17, S17e):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/T17.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import T17  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerT17(BMMinerX17, T17):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import T17Plus  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerT17Plus(BMMinerX17, T17Plus):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/T17e.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.btc._types import T17e  # noqa - Ignore access to _module
-
-from .X17 import BMMinerX17
-
-
-class BMMinerT17e(BMMinerX17, T17e):
-    pass

pyasic/miners/btc/antminer/bmminer/X17/X17.py

@@ -1,83 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from typing import Union
-
-from pyasic.miners.backends import BMMiner
-from pyasic.web.antminer import AntminerOldWebAPI
-
-
-class BMMinerX17(BMMiner):
-    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
-        super().__init__(ip, api_ver=api_ver)
-        self.ip = ip
-        self.web = AntminerOldWebAPI(ip)
-
-    async def get_mac(self) -> Union[str, None]:
-        try:
-            data = await self.web.get_system_info()
-            if data:
-                return data["macaddr"]
-        except KeyError:
-            pass
-
-    async def fault_light_on(self) -> bool:
-        # this should time out, after it does do a check
-        await self.web.blink(blink=True)
-        try:
-            data = await self.web.get_blink_status()
-            if data:
-                if data["isBlinking"]:
-                    self.light = True
-        except KeyError:
-            pass
-        return self.light
-
-    async def fault_light_off(self) -> bool:
-        await self.web.blink(blink=False)
-        try:
-            data = await self.web.get_blink_status()
-            if data:
-                if not data["isBlinking"]:
-                    self.light = False
-        except KeyError:
-            pass
-        return self.light
-
-    async def reboot(self) -> bool:
-        data = await self.web.reboot()
-        if data:
-            return True
-        return False
-
-    async def get_fault_light(self) -> bool:
-        if self.light:
-            return self.light
-        try:
-            data = await self.web.get_blink_status()
-            if data:
-                self.light = data["isBlinking"]
-        except KeyError:
-            pass
-        return self.light
-
-    async def get_hostname(self) -> Union[str, None]:
-        try:
-            data = await self.web.get_system_info()
-            if data:
-                return data["hostname"]
-        except KeyError:
-            pass

pyasic/miners/btc/antminer/bmminer/X17/__init__.py

@@ -1,23 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-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

pyasic/miners/btc/antminer/bmminer/X19/S19.py

@@ -1,24 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
-
-
-class BMMinerS19(AntminerModern, S19):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/S19L.py

@@ -1,22 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19L  # noqa - Ignore access to _module
-
-
-class BMMinerS19L(AntminerModern, S19L):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py

@@ -1,24 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19Pro  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
-
-
-class BMMinerS19Pro(AntminerModern, S19Pro):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py

@@ -1,24 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19XP  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
-
-
-class BMMinerS19XP(AntminerModern, S19XP):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/S19a.py

@@ -1,24 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19a  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
-
-
-class BMMinerS19a(AntminerModern, S19a):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py

@@ -1,24 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19aPro  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
-
-
-class BMMinerS19aPro(AntminerModern, S19aPro):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py

@@ -1,24 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from pyasic.miners.backends import AntminerModern
-from pyasic.miners.btc._types import S19jPro  # noqa - Ignore access to _module
-
-# noqa - Ignore access to _module
-
-
-class BMMinerS19jPro(AntminerModern, S19jPro):
-    pass

pyasic/miners/btc/antminer/bmminer/X19/__init__.py

@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from .S19 import BMMinerS19
-from .S19_Pro import BMMinerS19Pro
-from .S19_Pro_Plus import BMMinerS19ProPlus
-from .S19_XP import BMMinerS19XP
-from .S19a import BMMinerS19a
-from .S19a_Pro import BMMinerS19aPro
-from .S19j import BMMinerS19j, BMMinerS19jNoPIC
-from .S19j_Pro import BMMinerS19jPro
-from .S19L import BMMinerS19L
-from .T19 import BMMinerT19

pyasic/miners/btc/antminer/bmminer/X9/S9.py

@@ -1,43 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  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.                                              -
-# ------------------------------------------------------------------------------
-
-from typing import Union
-
-from pyasic.miners.backends import BMMiner
-from pyasic.miners.btc._types import S9  # noqa - Ignore access to _module
-from pyasic.web.S9 import S9WebAPI
-
-
-class BMMinerS9(BMMiner, S9):
-    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
-        super().__init__(ip, api_ver=api_ver)
-        self.ip = ip
-        self.web = S9WebAPI(ip)
-
-    async def get_mac(self) -> Union[str, None]:
-        try:
-            data = await self.web.get_system_info()
-            if data:
-                return data["macaddr"]
-        except KeyError:
-            pass
-
-        try:
-            data = await self.web.get_network_info()
-            if data:
-                return data["macaddr"]
-        except KeyError:
-            pass