From 09f9028ab5c4dc7465f1d802efed5a42c8d7f42d Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Thu, 2 Mar 2023 08:58:10 -0700 Subject: [PATCH] format: reformat miner files to improve readability. --- pyasic/load/__init__.py | 4 +- pyasic/miners/btc/__init__.py | 19 + pyasic/miners/{ => btc}/_backends/X19.py | 2 +- pyasic/miners/{ => btc}/_backends/__init__.py | 2 - pyasic/miners/{ => btc}/_backends/bmminer.py | 0 pyasic/miners/{ => btc}/_backends/bosminer.py | 0 .../{ => btc}/_backends/bosminer_old.py | 0 pyasic/miners/{ => btc}/_backends/btminer.py | 0 pyasic/miners/{ => btc}/_backends/cgminer.py | 0 .../{ => btc}/_backends/cgminer_avalon.py | 2 +- pyasic/miners/{ => btc}/_backends/hiveon.py | 2 +- pyasic/miners/{ => btc}/_backends/vnish.py | 2 +- pyasic/miners/{ => btc}/_types/__init__.py | 0 .../{ => btc}/_types/antminer/X17/S17.py | 2 +- .../{ => btc}/_types/antminer/X17/S17_Plus.py | 2 +- .../{ => btc}/_types/antminer/X17/S17_Pro.py | 2 +- .../{ => btc}/_types/antminer/X17/S17e.py | 2 +- .../{ => btc}/_types/antminer/X17/T17.py | 2 +- .../{ => btc}/_types/antminer/X17/T17_Plus.py | 2 +- .../{ => btc}/_types/antminer/X17/T17e.py | 2 +- .../{ => btc}/_types/antminer/X17/__init__.py | 0 .../{ => btc}/_types/antminer/X19/S19.py | 2 +- .../{ => btc}/_types/antminer/X19/S19_Pro.py | 2 +- .../{ => btc}/_types/antminer/X19/S19_XP.py | 2 +- .../{ => btc}/_types/antminer/X19/S19a.py | 2 +- .../{ => btc}/_types/antminer/X19/S19a_Pro.py | 2 +- .../{ => btc}/_types/antminer/X19/S19j.py | 2 +- .../{ => btc}/_types/antminer/X19/S19j_Pro.py | 2 +- .../{ => btc}/_types/antminer/X19/T19.py | 2 +- .../{ => btc}/_types/antminer/X19/__init__.py | 0 .../miners/{ => btc}/_types/antminer/X9/S9.py | 2 +- .../{ => btc}/_types/antminer/X9/S9i.py | 2 +- .../miners/{ => btc}/_types/antminer/X9/T9.py | 2 +- .../{ => btc}/_types/antminer/X9/__init__.py | 0 .../_types/antminer}/__init__.py | 1 - .../_types/avalonminer/A10X/A1026.py | 2 +- .../_types/avalonminer/A10X/A1047.py | 2 +- .../_types/avalonminer/A10X/A1066.py | 2 +- .../_types/avalonminer/A10X/__init__.py | 0 .../{ => btc}/_types/avalonminer/A7X/A721.py | 2 +- .../{ => btc}/_types/avalonminer/A7X/A741.py | 2 +- .../{ => btc}/_types/avalonminer/A7X/A761.py | 2 +- .../_types/avalonminer/A7X/__init__.py | 0 .../{ => btc}/_types/avalonminer/A8X/A821.py | 2 +- .../{ => btc}/_types/avalonminer/A8X/A841.py | 2 +- .../{ => btc}/_types/avalonminer/A8X/A851.py | 2 +- .../_types/avalonminer/A8X/__init__.py | 0 .../{ => btc}/_types/avalonminer/A9X/A921.py | 2 +- .../_types/avalonminer/A9X/__init__.py | 0 .../{ => btc}/_types/avalonminer/__init__.py | 0 .../_types/innosilicon/T3X/T3H_Plus.py | 2 +- .../_types/innosilicon/T3X/__init__.py | 0 .../{ => btc}/_types/innosilicon/__init__.py | 0 .../{ => btc}/_types/whatsminer/M2X/M20.py | 2 +- .../{ => btc}/_types/whatsminer/M2X/M20S.py | 2 +- .../_types/whatsminer/M2X/M20S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M2X/M21.py | 2 +- .../{ => btc}/_types/whatsminer/M2X/M21S.py | 2 +- .../_types/whatsminer/M2X/M21S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M2X/M29.py | 2 +- .../_types/whatsminer/M2X/__init__.py | 0 .../{ => btc}/_types/whatsminer/M3X/M30.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M30S.py | 2 +- .../_types/whatsminer/M3X/M30S_Plus.py | 2 +- .../_types/whatsminer/M3X/M30S_Plus_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M31.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M31H.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M31S.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M31SE.py | 2 +- .../_types/whatsminer/M3X/M31S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M32.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M32S.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M33.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M33S.py | 2 +- .../_types/whatsminer/M3X/M33S_Plus.py | 2 +- .../_types/whatsminer/M3X/M33S_Plus_Plus.py | 2 +- .../_types/whatsminer/M3X/M34S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M36S.py | 2 +- .../_types/whatsminer/M3X/M36S_Plus.py | 2 +- .../_types/whatsminer/M3X/M36S_Plus_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M3X/M39.py | 2 +- .../_types/whatsminer/M3X/__init__.py | 0 .../{ => btc}/_types/whatsminer/M5X/M50.py | 2 +- .../{ => btc}/_types/whatsminer/M5X/M50S.py | 2 +- .../_types/whatsminer/M5X/M50S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M5X/M53.py | 2 +- .../{ => btc}/_types/whatsminer/M5X/M53S.py | 2 +- .../_types/whatsminer/M5X/M53S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M5X/M56.py | 2 +- .../{ => btc}/_types/whatsminer/M5X/M56S.py | 2 +- .../_types/whatsminer/M5X/M56S_Plus.py | 2 +- .../{ => btc}/_types/whatsminer/M5X/M59.py | 2 +- .../_types/whatsminer/M5X/__init__.py | 0 .../{ => btc}/_types/whatsminer/__init__.py | 0 pyasic/miners/{ => btc}/antminer/__init__.py | 0 .../{ => btc}/antminer/bmminer/X17/S17.py | 2 +- .../antminer/bmminer/X17/S17_Plus.py | 2 +- .../{ => btc}/antminer/bmminer/X17/S17_Pro.py | 2 +- .../{ => btc}/antminer/bmminer/X17/S17e.py | 2 +- .../{ => btc}/antminer/bmminer/X17/T17.py | 2 +- .../antminer/bmminer/X17/T17_Plus.py | 2 +- .../{ => btc}/antminer/bmminer/X17/T17e.py | 2 +- .../{ => btc}/antminer/bmminer/X17/X17.py | 2 +- .../antminer/bmminer/X17/__init__.py | 0 .../{ => btc}/antminer/bmminer/X19/S19.py | 4 +- .../{ => btc}/antminer/bmminer/X19/S19_Pro.py | 4 +- .../{ => btc}/antminer/bmminer/X19/S19_XP.py | 4 +- .../{ => btc}/antminer/bmminer/X19/S19a.py | 4 +- .../antminer/bmminer/X19/S19a_Pro.py | 4 +- .../{ => btc}/antminer/bmminer/X19/S19j.py | 4 +- .../antminer/bmminer/X19/S19j_Pro.py | 4 +- .../{ => btc}/antminer/bmminer/X19/T19.py | 4 +- .../antminer/bmminer/X19/__init__.py | 0 .../{ => btc}/antminer/bmminer/X9/S9.py | 4 +- .../{ => btc}/antminer/bmminer/X9/S9i.py | 4 +- .../{ => btc}/antminer/bmminer/X9/T9.py | 4 +- .../{ => btc}/antminer/bmminer/X9/__init__.py | 0 .../antminer/bmminer}/__init__.py | 2 - .../{ => btc}/antminer/bosminer/X17/S17.py | 4 +- .../antminer/bosminer/X17/S17_Plus.py | 4 +- .../antminer/bosminer/X17/S17_Pro.py | 4 +- .../{ => btc}/antminer/bosminer/X17/S17e.py | 4 +- .../{ => btc}/antminer/bosminer/X17/T17.py | 4 +- .../antminer/bosminer/X17/T17_Plus.py | 4 +- .../{ => btc}/antminer/bosminer/X17/T17e.py | 4 +- .../antminer/bosminer/X17/__init__.py | 0 .../{ => btc}/antminer/bosminer/X19/S19.py | 4 +- .../antminer/bosminer/X19/S19_Pro.py | 4 +- .../{ => btc}/antminer/bosminer/X19/S19j.py | 4 +- .../antminer/bosminer/X19/S19j_Pro.py | 4 +- .../{ => btc}/antminer/bosminer/X19/T19.py | 4 +- .../antminer/bosminer/X19/__init__.py | 0 .../{ => btc}/antminer/bosminer/X9/S9.py | 4 +- .../antminer/bosminer/X9/__init__.py | 0 .../{ => btc}/antminer/bosminer/__init__.py | 0 .../{ => btc}/antminer/cgminer/X17/S17.py | 4 +- .../antminer/cgminer/X17/S17_Plus.py | 4 +- .../{ => btc}/antminer/cgminer/X17/S17_Pro.py | 4 +- .../{ => btc}/antminer/cgminer/X17/S17e.py | 4 +- .../{ => btc}/antminer/cgminer/X17/T17.py | 4 +- .../antminer/cgminer/X17/T17_Plus.py | 4 +- .../{ => btc}/antminer/cgminer/X17/T17e.py | 4 +- .../antminer/cgminer/X17/__init__.py | 0 .../{ => btc}/antminer/cgminer/X19/S19.py | 4 +- .../{ => btc}/antminer/cgminer/X19/S19_Pro.py | 4 +- .../{ => btc}/antminer/cgminer/X19/S19j.py | 4 +- .../antminer/cgminer/X19/S19j_Pro.py | 4 +- .../{ => btc}/antminer/cgminer/X19/T19.py | 4 +- .../antminer/cgminer/X19/__init__.py | 0 .../{ => btc}/antminer/cgminer/X9/S9.py | 4 +- .../{ => btc}/antminer/cgminer/X9/T9.py | 6 +- .../{ => btc}/antminer/cgminer/X9/__init__.py | 0 .../{ => btc}/antminer/cgminer/__init__.py | 1 - .../miners/{ => btc}/antminer/hiveon/X9/T9.py | 4 +- .../{ => btc}/antminer/hiveon/X9/__init__.py | 0 .../{ => btc}/antminer/hiveon/__init__.py | 0 .../{ => btc}/antminer/vnish/X19/S19.py | 4 +- .../{ => btc}/antminer/vnish/X19/S19_Pro.py | 4 +- .../{ => btc}/antminer/vnish/X19/S19_XP.py | 4 +- .../{ => btc}/antminer/vnish/X19/S19a.py | 4 +- .../{ => btc}/antminer/vnish/X19/S19a_Pro.py | 4 +- .../{ => btc}/antminer/vnish/X19/S19j.py | 4 +- .../{ => btc}/antminer/vnish/X19/S19j_Pro.py | 4 +- .../{ => btc}/antminer/vnish/X19/T19.py | 4 +- .../{ => btc}/antminer/vnish/X19/__init__.py | 0 .../{ => btc}/antminer/vnish/__init__.py | 0 .../miners/{ => btc}/avalonminer/__init__.py | 0 .../avalonminer/cgminer/A10X/A1026.py | 2 +- .../avalonminer/cgminer/A10X/A1047.py | 2 +- .../avalonminer/cgminer/A10X/A1066.py | 2 +- .../avalonminer/cgminer/A10X/A10X.py | 2 +- .../avalonminer/cgminer/A10X/__init__.py | 0 .../{ => btc}/avalonminer/cgminer/A7X/A721.py | 2 +- .../{ => btc}/avalonminer/cgminer/A7X/A741.py | 2 +- .../{ => btc}/avalonminer/cgminer/A7X/A761.py | 2 +- .../{ => btc}/avalonminer/cgminer/A7X/A7X.py | 2 +- .../avalonminer/cgminer/A7X/__init__.py | 0 .../{ => btc}/avalonminer/cgminer/A8X/A821.py | 2 +- .../{ => btc}/avalonminer/cgminer/A8X/A841.py | 2 +- .../{ => btc}/avalonminer/cgminer/A8X/A851.py | 2 +- .../{ => btc}/avalonminer/cgminer/A8X/A8X.py | 2 +- .../avalonminer/cgminer/A8X/__init__.py | 0 .../{ => btc}/avalonminer/cgminer/A9X/A921.py | 4 +- .../avalonminer/cgminer/A9X/__init__.py | 0 .../{ => btc}/avalonminer/cgminer/__init__.py | 0 .../miners/{ => btc}/innosilicon/__init__.py | 0 .../innosilicon/cgminer/T3X/T3H_Plus.py | 6 +- .../innosilicon/cgminer/T3X/__init__.py | 0 .../{ => btc}/innosilicon/cgminer/__init__.py | 0 .../miners/{ => btc}/whatsminer/__init__.py | 0 .../{ => btc}/whatsminer/btminer/M2X/M20.py | 4 +- .../{ => btc}/whatsminer/btminer/M2X/M20S.py | 4 +- .../whatsminer/btminer/M2X/M20S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M2X/M21.py | 4 +- .../{ => btc}/whatsminer/btminer/M2X/M21S.py | 4 +- .../whatsminer/btminer/M2X/M21S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M2X/M29.py | 4 +- .../whatsminer/btminer/M2X/__init__.py | 0 .../{ => btc}/whatsminer/btminer/M3X/M30.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M30S.py | 4 +- .../whatsminer/btminer/M3X/M30S_Plus.py | 4 +- .../whatsminer/btminer/M3X/M30S_Plus_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M31.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M31H.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M31S.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M31SE.py | 4 +- .../whatsminer/btminer/M3X/M31S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M32.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M32S.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M33.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M33S.py | 4 +- .../whatsminer/btminer/M3X/M33S_Plus.py | 4 +- .../whatsminer/btminer/M3X/M33S_Plus_Plus.py | 4 +- .../whatsminer/btminer/M3X/M34S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M36S.py | 4 +- .../whatsminer/btminer/M3X/M36S_Plus.py | 4 +- .../whatsminer/btminer/M3X/M36S_Plus_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M3X/M39.py | 4 +- .../whatsminer/btminer/M3X/__init__.py | 0 .../{ => btc}/whatsminer/btminer/M5X/M50.py | 4 +- .../{ => btc}/whatsminer/btminer/M5X/M50S.py | 4 +- .../whatsminer/btminer/M5X/M50S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M5X/M53.py | 4 +- .../{ => btc}/whatsminer/btminer/M5X/M53S.py | 4 +- .../whatsminer/btminer/M5X/M53S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M5X/M56.py | 4 +- .../{ => btc}/whatsminer/btminer/M5X/M56S.py | 4 +- .../whatsminer/btminer/M5X/M56S_Plus.py | 4 +- .../{ => btc}/whatsminer/btminer/M5X/M59.py | 4 +- .../whatsminer/btminer/M5X/__init__.py | 0 .../{ => btc}/whatsminer/btminer/__init__.py | 0 .../{antminer/cgminer/X15 => ltc}/__init__.py | 2 +- pyasic/miners/{ => ltc}/_backends/X7.py | 6 +- pyasic/miners/ltc/_backends/__init__.py | 16 + pyasic/miners/ltc/_types/__init__.py | 17 + .../miners/{ => ltc}/_types/antminer/X7/L7.py | 2 +- .../miners/ltc/_types/antminer/X7/__init__.py | 16 + .../X7 => ltc/_types/antminer}/__init__.py | 2 +- pyasic/miners/ltc/antminer/__init__.py | 17 + .../{ => ltc}/antminer/bmminer/X7/L7.py | 4 +- .../{ => ltc}/antminer/bmminer/X7/__init__.py | 0 .../X15 => ltc/antminer/bmminer}/__init__.py | 2 +- pyasic/miners/{_types => }/makes.py | 0 pyasic/miners/miner_factory.py | 19 +- pyasic/miners/zec/__init__.py | 16 + pyasic/miners/{ => zec}/_backends/X15.py | 66 ++- pyasic/miners/zec/_backends/__init__.py | 17 + pyasic/miners/zec/_backends/cgminer.py | 397 ++++++++++++++++++ pyasic/miners/zec/_types/__init__.py | 16 + .../{ => zec}/_types/antminer/X15/Z15.py | 2 +- .../zec/_types/antminer/X15/__init__.py | 16 + pyasic/miners/zec/_types/antminer/__init__.py | 16 + pyasic/miners/zec/antminer/__init__.py | 16 + .../{ => zec}/antminer/cgminer/X15/Z15.py | 4 +- .../zec/antminer/cgminer/X15/__init__.py | 16 + .../miners/zec/antminer/cgminer/__init__.py | 16 + tests/miners_tests/__init__.py | 26 +- 257 files changed, 965 insertions(+), 319 deletions(-) create mode 100644 pyasic/miners/btc/__init__.py rename pyasic/miners/{ => btc}/_backends/X19.py (98%) rename pyasic/miners/{ => btc}/_backends/__init__.py (97%) rename pyasic/miners/{ => btc}/_backends/bmminer.py (100%) rename pyasic/miners/{ => btc}/_backends/bosminer.py (100%) rename pyasic/miners/{ => btc}/_backends/bosminer_old.py (100%) rename pyasic/miners/{ => btc}/_backends/btminer.py (100%) rename pyasic/miners/{ => btc}/_backends/cgminer.py (100%) rename pyasic/miners/{ => btc}/_backends/cgminer_avalon.py (99%) rename pyasic/miners/{ => btc}/_backends/hiveon.py (96%) rename pyasic/miners/{ => btc}/_backends/vnish.py (98%) rename pyasic/miners/{ => btc}/_types/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/antminer/X17/S17.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/S17_Plus.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/S17_Pro.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/S17e.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/T17.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/T17_Plus.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/T17e.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X17/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19_Pro.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19_XP.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19a.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19a_Pro.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19j.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/S19j_Pro.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/T19.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X19/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/antminer/X9/S9.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X9/S9i.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X9/T9.py (96%) rename pyasic/miners/{ => btc}/_types/antminer/X9/__init__.py (100%) rename pyasic/miners/{antminer/bmminer => btc/_types/antminer}/__init__.py (98%) rename pyasic/miners/{ => btc}/_types/avalonminer/A10X/A1026.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A10X/A1047.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A10X/A1066.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A10X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/avalonminer/A7X/A721.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A7X/A741.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A7X/A761.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A7X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/avalonminer/A8X/A821.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A8X/A841.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A8X/A851.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A8X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/avalonminer/A9X/A921.py (96%) rename pyasic/miners/{ => btc}/_types/avalonminer/A9X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/avalonminer/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/innosilicon/T3X/T3H_Plus.py (96%) rename pyasic/miners/{ => btc}/_types/innosilicon/T3X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/innosilicon/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M20.py (96%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M20S.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M20S_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M21.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M21S.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M21S_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/M29.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M2X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M30.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M30S.py (99%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M30S_Plus.py (99%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M30S_Plus_Plus.py (99%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M31.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M31H.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M31S.py (99%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M31SE.py (98%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M31S_Plus.py (99%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M32.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M32S.py (96%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M33.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M33S.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M33S_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M33S_Plus_Plus.py (98%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M34S_Plus.py (96%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M36S.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M36S_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M36S_Plus_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/M39.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M3X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M50.py (99%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M50S.py (98%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M50S_Plus.py (98%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M53.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M53S.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M53S_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M56.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M56S.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M56S_Plus.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/M59.py (97%) rename pyasic/miners/{ => btc}/_types/whatsminer/M5X/__init__.py (100%) rename pyasic/miners/{ => btc}/_types/whatsminer/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/S17.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/S17_Plus.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/S17_Pro.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/S17e.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/T17.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/T17_Plus.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/T17e.py (94%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/X17.py (97%) rename pyasic/miners/{ => btc}/antminer/bmminer/X17/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19_Pro.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19_XP.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19a.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19a_Pro.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19j.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/S19j_Pro.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/T19.py (89%) rename pyasic/miners/{ => btc}/antminer/bmminer/X19/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/bmminer/X9/S9.py (92%) rename pyasic/miners/{ => btc}/antminer/bmminer/X9/S9i.py (88%) rename pyasic/miners/{ => btc}/antminer/bmminer/X9/T9.py (88%) rename pyasic/miners/{ => btc}/antminer/bmminer/X9/__init__.py (100%) rename pyasic/miners/{_types/antminer => btc/antminer/bmminer}/__init__.py (97%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/S17.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/S17_Plus.py (89%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/S17_Pro.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/S17e.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/T17.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/T17_Plus.py (89%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/T17e.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X17/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/bosminer/X19/S19.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X19/S19_Pro.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X19/S19j.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X19/S19j_Pro.py (89%) rename pyasic/miners/{ => btc}/antminer/bosminer/X19/T19.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X19/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/bosminer/X9/S9.py (88%) rename pyasic/miners/{ => btc}/antminer/bosminer/X9/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/bosminer/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/S17.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/S17_Plus.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/S17_Pro.py (89%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/S17e.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/T17.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/T17_Plus.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/T17e.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X17/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/cgminer/X19/S19.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X19/S19_Pro.py (89%) rename pyasic/miners/{ => btc}/antminer/cgminer/X19/S19j.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X19/S19j_Pro.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X19/T19.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X19/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/cgminer/X9/S9.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X9/T9.py (88%) rename pyasic/miners/{ => btc}/antminer/cgminer/X9/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/cgminer/__init__.py (98%) rename pyasic/miners/{ => btc}/antminer/hiveon/X9/T9.py (96%) rename pyasic/miners/{ => btc}/antminer/hiveon/X9/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/hiveon/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19.py (88%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19_Pro.py (88%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19_XP.py (88%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19a.py (89%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19a_Pro.py (88%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19j.py (89%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/S19j_Pro.py (88%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/T19.py (88%) rename pyasic/miners/{ => btc}/antminer/vnish/X19/__init__.py (100%) rename pyasic/miners/{ => btc}/antminer/vnish/__init__.py (100%) rename pyasic/miners/{ => btc}/avalonminer/__init__.py (100%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A10X/A1026.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A10X/A1047.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A10X/A1066.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A10X/A10X.py (93%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A10X/__init__.py (100%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A7X/A721.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A7X/A741.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A7X/A761.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A7X/A7X.py (93%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A7X/__init__.py (100%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A8X/A821.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A8X/A841.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A8X/A851.py (94%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A8X/A8X.py (93%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A8X/__init__.py (100%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A9X/A921.py (88%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/A9X/__init__.py (100%) rename pyasic/miners/{ => btc}/avalonminer/cgminer/__init__.py (100%) rename pyasic/miners/{ => btc}/innosilicon/__init__.py (100%) rename pyasic/miners/{ => btc}/innosilicon/cgminer/T3X/T3H_Plus.py (98%) rename pyasic/miners/{ => btc}/innosilicon/cgminer/T3X/__init__.py (100%) rename pyasic/miners/{ => btc}/innosilicon/cgminer/__init__.py (100%) rename pyasic/miners/{ => btc}/whatsminer/__init__.py (100%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M20.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M20S.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M20S_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M21.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M21S.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M21S_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/M29.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M2X/__init__.py (100%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M30.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M30S.py (95%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M30S_Plus.py (95%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M30S_Plus_Plus.py (95%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M31.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M31H.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M31S.py (92%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M31SE.py (90%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M31S_Plus.py (94%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M32.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M32S.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M33.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M33S.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M33S_Plus.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M33S_Plus_Plus.py (90%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M34S_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M36S.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M36S_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M36S_Plus_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/M39.py (89%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M3X/__init__.py (100%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M50.py (92%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M50S.py (91%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M50S_Plus.py (90%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M53.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M53S.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M53S_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M56.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M56S.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M56S_Plus.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/M59.py (88%) rename pyasic/miners/{ => btc}/whatsminer/btminer/M5X/__init__.py (100%) rename pyasic/miners/{ => btc}/whatsminer/btminer/__init__.py (100%) rename pyasic/miners/{antminer/cgminer/X15 => ltc}/__init__.py (97%) rename pyasic/miners/{ => ltc}/_backends/X7.py (99%) create mode 100644 pyasic/miners/ltc/_backends/__init__.py create mode 100644 pyasic/miners/ltc/_types/__init__.py rename pyasic/miners/{ => ltc}/_types/antminer/X7/L7.py (96%) create mode 100644 pyasic/miners/ltc/_types/antminer/X7/__init__.py rename pyasic/miners/{_types/antminer/X7 => ltc/_types/antminer}/__init__.py (98%) create mode 100644 pyasic/miners/ltc/antminer/__init__.py rename pyasic/miners/{ => ltc}/antminer/bmminer/X7/L7.py (89%) rename pyasic/miners/{ => ltc}/antminer/bmminer/X7/__init__.py (100%) rename pyasic/miners/{_types/antminer/X15 => ltc/antminer/bmminer}/__init__.py (98%) rename pyasic/miners/{_types => }/makes.py (100%) create mode 100644 pyasic/miners/zec/__init__.py rename pyasic/miners/{ => zec}/_backends/X15.py (80%) create mode 100644 pyasic/miners/zec/_backends/__init__.py create mode 100644 pyasic/miners/zec/_backends/cgminer.py create mode 100644 pyasic/miners/zec/_types/__init__.py rename pyasic/miners/{ => zec}/_types/antminer/X15/Z15.py (96%) create mode 100644 pyasic/miners/zec/_types/antminer/X15/__init__.py create mode 100644 pyasic/miners/zec/_types/antminer/__init__.py create mode 100644 pyasic/miners/zec/antminer/__init__.py rename pyasic/miners/{ => zec}/antminer/cgminer/X15/Z15.py (89%) create mode 100644 pyasic/miners/zec/antminer/cgminer/X15/__init__.py create mode 100644 pyasic/miners/zec/antminer/cgminer/__init__.py diff --git a/pyasic/load/__init__.py b/pyasic/load/__init__.py index 030fcce5..f6d99f32 100644 --- a/pyasic/load/__init__.py +++ b/pyasic/load/__init__.py @@ -19,12 +19,12 @@ 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 +from pyasic.miners.btc._backends import ( # noqa - Ignore access to _module X19, BOSMiner, BTMiner, ) -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module S9, S17, T17, diff --git a/pyasic/miners/btc/__init__.py b/pyasic/miners/btc/__init__.py new file mode 100644 index 00000000..0e6a1720 --- /dev/null +++ b/pyasic/miners/btc/__init__.py @@ -0,0 +1,19 @@ +# ------------------------------------------------------------------------------ +# 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 * diff --git a/pyasic/miners/_backends/X19.py b/pyasic/miners/btc/_backends/X19.py similarity index 98% rename from pyasic/miners/_backends/X19.py rename to pyasic/miners/btc/_backends/X19.py index 69cc87cc..f749b376 100644 --- a/pyasic/miners/_backends/X19.py +++ b/pyasic/miners/btc/_backends/X19.py @@ -20,7 +20,7 @@ from typing import List, Optional, Union from pyasic.API import APIError from pyasic.config import MinerConfig, X19PowerMode from pyasic.data.error_codes import MinerErrorData, X19Error -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module from pyasic.web.X19 import X19WebAPI diff --git a/pyasic/miners/_backends/__init__.py b/pyasic/miners/btc/_backends/__init__.py similarity index 97% rename from pyasic/miners/_backends/__init__.py rename to pyasic/miners/btc/_backends/__init__.py index f8562a3f..96364e95 100644 --- a/pyasic/miners/_backends/__init__.py +++ b/pyasic/miners/btc/_backends/__init__.py @@ -22,5 +22,3 @@ from .cgminer_avalon import CGMinerAvalon from .hiveon import Hiveon from .vnish import VNish from .X19 import X19 -from .X7 import X7 -from .X15 import X15 diff --git a/pyasic/miners/_backends/bmminer.py b/pyasic/miners/btc/_backends/bmminer.py similarity index 100% rename from pyasic/miners/_backends/bmminer.py rename to pyasic/miners/btc/_backends/bmminer.py diff --git a/pyasic/miners/_backends/bosminer.py b/pyasic/miners/btc/_backends/bosminer.py similarity index 100% rename from pyasic/miners/_backends/bosminer.py rename to pyasic/miners/btc/_backends/bosminer.py diff --git a/pyasic/miners/_backends/bosminer_old.py b/pyasic/miners/btc/_backends/bosminer_old.py similarity index 100% rename from pyasic/miners/_backends/bosminer_old.py rename to pyasic/miners/btc/_backends/bosminer_old.py diff --git a/pyasic/miners/_backends/btminer.py b/pyasic/miners/btc/_backends/btminer.py similarity index 100% rename from pyasic/miners/_backends/btminer.py rename to pyasic/miners/btc/_backends/btminer.py diff --git a/pyasic/miners/_backends/cgminer.py b/pyasic/miners/btc/_backends/cgminer.py similarity index 100% rename from pyasic/miners/_backends/cgminer.py rename to pyasic/miners/btc/_backends/cgminer.py diff --git a/pyasic/miners/_backends/cgminer_avalon.py b/pyasic/miners/btc/_backends/cgminer_avalon.py similarity index 99% rename from pyasic/miners/_backends/cgminer_avalon.py rename to pyasic/miners/btc/_backends/cgminer_avalon.py index fab2ea53..6c8c79e2 100644 --- a/pyasic/miners/_backends/cgminer_avalon.py +++ b/pyasic/miners/btc/_backends/cgminer_avalon.py @@ -22,7 +22,7 @@ from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.data.error_codes import MinerErrorData from pyasic.errors import APIError -from pyasic.miners._backends import CGMiner +from pyasic.miners.btc._backends import CGMiner class CGMinerAvalon(CGMiner): diff --git a/pyasic/miners/_backends/hiveon.py b/pyasic/miners/btc/_backends/hiveon.py similarity index 96% rename from pyasic/miners/_backends/hiveon.py rename to pyasic/miners/btc/_backends/hiveon.py index 01f07b18..5281d4a6 100644 --- a/pyasic/miners/_backends/hiveon.py +++ b/pyasic/miners/btc/_backends/hiveon.py @@ -16,7 +16,7 @@ import ipaddress -from pyasic.miners._backends import BMMiner +from pyasic.miners.btc._backends import BMMiner class Hiveon(BMMiner): diff --git a/pyasic/miners/_backends/vnish.py b/pyasic/miners/btc/_backends/vnish.py similarity index 98% rename from pyasic/miners/_backends/vnish.py rename to pyasic/miners/btc/_backends/vnish.py index 59638bea..3423bc5c 100644 --- a/pyasic/miners/_backends/vnish.py +++ b/pyasic/miners/btc/_backends/vnish.py @@ -18,7 +18,7 @@ import logging from typing import Optional from pyasic.errors import APIError -from pyasic.miners._backends.bmminer import BMMiner +from pyasic.miners.btc._backends.bmminer import BMMiner from pyasic.web.vnish import VNishWebAPI diff --git a/pyasic/miners/_types/__init__.py b/pyasic/miners/btc/_types/__init__.py similarity index 100% rename from pyasic/miners/_types/__init__.py rename to pyasic/miners/btc/_types/__init__.py diff --git a/pyasic/miners/_types/antminer/X17/S17.py b/pyasic/miners/btc/_types/antminer/X17/S17.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/S17.py rename to pyasic/miners/btc/_types/antminer/X17/S17.py index c6317f91..8ea64f0f 100644 --- a/pyasic/miners/_types/antminer/X17/S17.py +++ b/pyasic/miners/btc/_types/antminer/X17/S17.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S17(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/S17_Plus.py b/pyasic/miners/btc/_types/antminer/X17/S17_Plus.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/S17_Plus.py rename to pyasic/miners/btc/_types/antminer/X17/S17_Plus.py index c63f3658..1abf55c5 100644 --- a/pyasic/miners/_types/antminer/X17/S17_Plus.py +++ b/pyasic/miners/btc/_types/antminer/X17/S17_Plus.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S17Plus(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/S17_Pro.py b/pyasic/miners/btc/_types/antminer/X17/S17_Pro.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/S17_Pro.py rename to pyasic/miners/btc/_types/antminer/X17/S17_Pro.py index 7d1640f1..713d5fb6 100644 --- a/pyasic/miners/_types/antminer/X17/S17_Pro.py +++ b/pyasic/miners/btc/_types/antminer/X17/S17_Pro.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S17Pro(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/S17e.py b/pyasic/miners/btc/_types/antminer/X17/S17e.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/S17e.py rename to pyasic/miners/btc/_types/antminer/X17/S17e.py index b793ebeb..37424d12 100644 --- a/pyasic/miners/_types/antminer/X17/S17e.py +++ b/pyasic/miners/btc/_types/antminer/X17/S17e.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S17e(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/T17.py b/pyasic/miners/btc/_types/antminer/X17/T17.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/T17.py rename to pyasic/miners/btc/_types/antminer/X17/T17.py index e9619621..8160ef8d 100644 --- a/pyasic/miners/_types/antminer/X17/T17.py +++ b/pyasic/miners/btc/_types/antminer/X17/T17.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class T17(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/T17_Plus.py b/pyasic/miners/btc/_types/antminer/X17/T17_Plus.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/T17_Plus.py rename to pyasic/miners/btc/_types/antminer/X17/T17_Plus.py index aa48f726..6f431515 100644 --- a/pyasic/miners/_types/antminer/X17/T17_Plus.py +++ b/pyasic/miners/btc/_types/antminer/X17/T17_Plus.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class T17Plus(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/T17e.py b/pyasic/miners/btc/_types/antminer/X17/T17e.py similarity index 96% rename from pyasic/miners/_types/antminer/X17/T17e.py rename to pyasic/miners/btc/_types/antminer/X17/T17e.py index 6b85a77d..8e65bbb1 100644 --- a/pyasic/miners/_types/antminer/X17/T17e.py +++ b/pyasic/miners/btc/_types/antminer/X17/T17e.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class T17e(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X17/__init__.py b/pyasic/miners/btc/_types/antminer/X17/__init__.py similarity index 100% rename from pyasic/miners/_types/antminer/X17/__init__.py rename to pyasic/miners/btc/_types/antminer/X17/__init__.py diff --git a/pyasic/miners/_types/antminer/X19/S19.py b/pyasic/miners/btc/_types/antminer/X19/S19.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19.py rename to pyasic/miners/btc/_types/antminer/X19/S19.py index 0c6b5702..e84f07eb 100644 --- a/pyasic/miners/_types/antminer/X19/S19.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/S19_Pro.py b/pyasic/miners/btc/_types/antminer/X19/S19_Pro.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19_Pro.py rename to pyasic/miners/btc/_types/antminer/X19/S19_Pro.py index a71d0580..a9cae836 100644 --- a/pyasic/miners/_types/antminer/X19/S19_Pro.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19_Pro.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19Pro(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/S19_XP.py b/pyasic/miners/btc/_types/antminer/X19/S19_XP.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19_XP.py rename to pyasic/miners/btc/_types/antminer/X19/S19_XP.py index 5b9e4275..42eec594 100644 --- a/pyasic/miners/_types/antminer/X19/S19_XP.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19_XP.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19XP(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/S19a.py b/pyasic/miners/btc/_types/antminer/X19/S19a.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19a.py rename to pyasic/miners/btc/_types/antminer/X19/S19a.py index 3bf679b8..c33c3f59 100644 --- a/pyasic/miners/_types/antminer/X19/S19a.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19a.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19a(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/S19a_Pro.py b/pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19a_Pro.py rename to pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py index a7a4d1b4..38e16991 100644 --- a/pyasic/miners/_types/antminer/X19/S19a_Pro.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19aPro(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/S19j.py b/pyasic/miners/btc/_types/antminer/X19/S19j.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19j.py rename to pyasic/miners/btc/_types/antminer/X19/S19j.py index 4bf2c6b2..27e5a55e 100644 --- a/pyasic/miners/_types/antminer/X19/S19j.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19j.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19j(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/S19j_Pro.py b/pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/S19j_Pro.py rename to pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py index dba4fc09..c5e2ce7a 100644 --- a/pyasic/miners/_types/antminer/X19/S19j_Pro.py +++ b/pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S19jPro(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/T19.py b/pyasic/miners/btc/_types/antminer/X19/T19.py similarity index 96% rename from pyasic/miners/_types/antminer/X19/T19.py rename to pyasic/miners/btc/_types/antminer/X19/T19.py index 1d388b6f..9f42a1f8 100644 --- a/pyasic/miners/_types/antminer/X19/T19.py +++ b/pyasic/miners/btc/_types/antminer/X19/T19.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class T19(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X19/__init__.py b/pyasic/miners/btc/_types/antminer/X19/__init__.py similarity index 100% rename from pyasic/miners/_types/antminer/X19/__init__.py rename to pyasic/miners/btc/_types/antminer/X19/__init__.py diff --git a/pyasic/miners/_types/antminer/X9/S9.py b/pyasic/miners/btc/_types/antminer/X9/S9.py similarity index 96% rename from pyasic/miners/_types/antminer/X9/S9.py rename to pyasic/miners/btc/_types/antminer/X9/S9.py index 8c106eb4..103d3545 100644 --- a/pyasic/miners/_types/antminer/X9/S9.py +++ b/pyasic/miners/btc/_types/antminer/X9/S9.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S9(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X9/S9i.py b/pyasic/miners/btc/_types/antminer/X9/S9i.py similarity index 96% rename from pyasic/miners/_types/antminer/X9/S9i.py rename to pyasic/miners/btc/_types/antminer/X9/S9i.py index 85b0acdf..43c48fe8 100644 --- a/pyasic/miners/_types/antminer/X9/S9i.py +++ b/pyasic/miners/btc/_types/antminer/X9/S9i.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class S9i(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X9/T9.py b/pyasic/miners/btc/_types/antminer/X9/T9.py similarity index 96% rename from pyasic/miners/_types/antminer/X9/T9.py rename to pyasic/miners/btc/_types/antminer/X9/T9.py index 8a1eb88f..755ba30f 100644 --- a/pyasic/miners/_types/antminer/X9/T9.py +++ b/pyasic/miners/btc/_types/antminer/X9/T9.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class T9(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/antminer/X9/__init__.py b/pyasic/miners/btc/_types/antminer/X9/__init__.py similarity index 100% rename from pyasic/miners/_types/antminer/X9/__init__.py rename to pyasic/miners/btc/_types/antminer/X9/__init__.py diff --git a/pyasic/miners/antminer/bmminer/__init__.py b/pyasic/miners/btc/_types/antminer/__init__.py similarity index 98% rename from pyasic/miners/antminer/bmminer/__init__.py rename to pyasic/miners/btc/_types/antminer/__init__.py index 809024d7..d4d4051b 100644 --- a/pyasic/miners/antminer/bmminer/__init__.py +++ b/pyasic/miners/btc/_types/antminer/__init__.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .X7 import * from .X9 import * from .X17 import * from .X19 import * diff --git a/pyasic/miners/_types/avalonminer/A10X/A1026.py b/pyasic/miners/btc/_types/avalonminer/A10X/A1026.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A10X/A1026.py rename to pyasic/miners/btc/_types/avalonminer/A10X/A1026.py index 6a71ec1a..abcd6f9b 100644 --- a/pyasic/miners/_types/avalonminer/A10X/A1026.py +++ b/pyasic/miners/btc/_types/avalonminer/A10X/A1026.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon1026(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A10X/A1047.py b/pyasic/miners/btc/_types/avalonminer/A10X/A1047.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A10X/A1047.py rename to pyasic/miners/btc/_types/avalonminer/A10X/A1047.py index a0993cb8..fbf8bf06 100644 --- a/pyasic/miners/_types/avalonminer/A10X/A1047.py +++ b/pyasic/miners/btc/_types/avalonminer/A10X/A1047.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon1047(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A10X/A1066.py b/pyasic/miners/btc/_types/avalonminer/A10X/A1066.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A10X/A1066.py rename to pyasic/miners/btc/_types/avalonminer/A10X/A1066.py index d9d971e3..5d8e2a4a 100644 --- a/pyasic/miners/_types/avalonminer/A10X/A1066.py +++ b/pyasic/miners/btc/_types/avalonminer/A10X/A1066.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon1066(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A10X/__init__.py b/pyasic/miners/btc/_types/avalonminer/A10X/__init__.py similarity index 100% rename from pyasic/miners/_types/avalonminer/A10X/__init__.py rename to pyasic/miners/btc/_types/avalonminer/A10X/__init__.py diff --git a/pyasic/miners/_types/avalonminer/A7X/A721.py b/pyasic/miners/btc/_types/avalonminer/A7X/A721.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A7X/A721.py rename to pyasic/miners/btc/_types/avalonminer/A7X/A721.py index 74bce0bb..1333303b 100644 --- a/pyasic/miners/_types/avalonminer/A7X/A721.py +++ b/pyasic/miners/btc/_types/avalonminer/A7X/A721.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon721(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A7X/A741.py b/pyasic/miners/btc/_types/avalonminer/A7X/A741.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A7X/A741.py rename to pyasic/miners/btc/_types/avalonminer/A7X/A741.py index 16922bca..e8b84792 100644 --- a/pyasic/miners/_types/avalonminer/A7X/A741.py +++ b/pyasic/miners/btc/_types/avalonminer/A7X/A741.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon741(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A7X/A761.py b/pyasic/miners/btc/_types/avalonminer/A7X/A761.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A7X/A761.py rename to pyasic/miners/btc/_types/avalonminer/A7X/A761.py index 5278aaa6..54f453da 100644 --- a/pyasic/miners/_types/avalonminer/A7X/A761.py +++ b/pyasic/miners/btc/_types/avalonminer/A7X/A761.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon761(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A7X/__init__.py b/pyasic/miners/btc/_types/avalonminer/A7X/__init__.py similarity index 100% rename from pyasic/miners/_types/avalonminer/A7X/__init__.py rename to pyasic/miners/btc/_types/avalonminer/A7X/__init__.py diff --git a/pyasic/miners/_types/avalonminer/A8X/A821.py b/pyasic/miners/btc/_types/avalonminer/A8X/A821.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A8X/A821.py rename to pyasic/miners/btc/_types/avalonminer/A8X/A821.py index b81fea6b..3863f419 100644 --- a/pyasic/miners/_types/avalonminer/A8X/A821.py +++ b/pyasic/miners/btc/_types/avalonminer/A8X/A821.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon821(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A8X/A841.py b/pyasic/miners/btc/_types/avalonminer/A8X/A841.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A8X/A841.py rename to pyasic/miners/btc/_types/avalonminer/A8X/A841.py index e2610f96..38ce787a 100644 --- a/pyasic/miners/_types/avalonminer/A8X/A841.py +++ b/pyasic/miners/btc/_types/avalonminer/A8X/A841.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon841(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A8X/A851.py b/pyasic/miners/btc/_types/avalonminer/A8X/A851.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A8X/A851.py rename to pyasic/miners/btc/_types/avalonminer/A8X/A851.py index ae58edd5..c1efbe36 100644 --- a/pyasic/miners/_types/avalonminer/A8X/A851.py +++ b/pyasic/miners/btc/_types/avalonminer/A8X/A851.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon851(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A8X/__init__.py b/pyasic/miners/btc/_types/avalonminer/A8X/__init__.py similarity index 100% rename from pyasic/miners/_types/avalonminer/A8X/__init__.py rename to pyasic/miners/btc/_types/avalonminer/A8X/__init__.py diff --git a/pyasic/miners/_types/avalonminer/A9X/A921.py b/pyasic/miners/btc/_types/avalonminer/A9X/A921.py similarity index 96% rename from pyasic/miners/_types/avalonminer/A9X/A921.py rename to pyasic/miners/btc/_types/avalonminer/A9X/A921.py index 1daad427..0e854c7d 100644 --- a/pyasic/miners/_types/avalonminer/A9X/A921.py +++ b/pyasic/miners/btc/_types/avalonminer/A9X/A921.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AvalonMiner +from pyasic.miners.makes import AvalonMiner class Avalon921(AvalonMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/avalonminer/A9X/__init__.py b/pyasic/miners/btc/_types/avalonminer/A9X/__init__.py similarity index 100% rename from pyasic/miners/_types/avalonminer/A9X/__init__.py rename to pyasic/miners/btc/_types/avalonminer/A9X/__init__.py diff --git a/pyasic/miners/_types/avalonminer/__init__.py b/pyasic/miners/btc/_types/avalonminer/__init__.py similarity index 100% rename from pyasic/miners/_types/avalonminer/__init__.py rename to pyasic/miners/btc/_types/avalonminer/__init__.py diff --git a/pyasic/miners/_types/innosilicon/T3X/T3H_Plus.py b/pyasic/miners/btc/_types/innosilicon/T3X/T3H_Plus.py similarity index 96% rename from pyasic/miners/_types/innosilicon/T3X/T3H_Plus.py rename to pyasic/miners/btc/_types/innosilicon/T3X/T3H_Plus.py index 57b99d5a..a09d857f 100644 --- a/pyasic/miners/_types/innosilicon/T3X/T3H_Plus.py +++ b/pyasic/miners/btc/_types/innosilicon/T3X/T3H_Plus.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import InnosiliconMiner +from pyasic.miners.makes import InnosiliconMiner class InnosiliconT3HPlus(InnosiliconMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/innosilicon/T3X/__init__.py b/pyasic/miners/btc/_types/innosilicon/T3X/__init__.py similarity index 100% rename from pyasic/miners/_types/innosilicon/T3X/__init__.py rename to pyasic/miners/btc/_types/innosilicon/T3X/__init__.py diff --git a/pyasic/miners/_types/innosilicon/__init__.py b/pyasic/miners/btc/_types/innosilicon/__init__.py similarity index 100% rename from pyasic/miners/_types/innosilicon/__init__.py rename to pyasic/miners/btc/_types/innosilicon/__init__.py diff --git a/pyasic/miners/_types/whatsminer/M2X/M20.py b/pyasic/miners/btc/_types/whatsminer/M2X/M20.py similarity index 96% rename from pyasic/miners/_types/whatsminer/M2X/M20.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M20.py index fd628508..519b3b99 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M20.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M20.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M20V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/M20S.py b/pyasic/miners/btc/_types/whatsminer/M2X/M20S.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M2X/M20S.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M20S.py index 2810ad97..2cefab62 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M20S.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M20S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M20SV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/M20S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M2X/M20S_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M2X/M20S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M20S_Plus.py index 5ad0e993..327625aa 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M20S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M20S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M20SPlusV30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/M21.py b/pyasic/miners/btc/_types/whatsminer/M2X/M21.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M2X/M21.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M21.py index ec507ede..62d47c92 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M21.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M21.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M21V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/M21S.py b/pyasic/miners/btc/_types/whatsminer/M2X/M21S.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M2X/M21S.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M21S.py index 5d0ca635..3ca9bef1 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M21S.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M21S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M21SV20(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/M21S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M2X/M21S_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M2X/M21S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M21S_Plus.py index 96f200cb..02745c07 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M21S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M21S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M21SPlusV20(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/M29.py b/pyasic/miners/btc/_types/whatsminer/M2X/M29.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M2X/M29.py rename to pyasic/miners/btc/_types/whatsminer/M2X/M29.py index 2841811a..1331b9a6 100644 --- a/pyasic/miners/_types/whatsminer/M2X/M29.py +++ b/pyasic/miners/btc/_types/whatsminer/M2X/M29.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M29V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M2X/__init__.py b/pyasic/miners/btc/_types/whatsminer/M2X/__init__.py similarity index 100% rename from pyasic/miners/_types/whatsminer/M2X/__init__.py rename to pyasic/miners/btc/_types/whatsminer/M2X/__init__.py diff --git a/pyasic/miners/_types/whatsminer/M3X/M30.py b/pyasic/miners/btc/_types/whatsminer/M3X/M30.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M30.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M30.py index 826f01a1..b4dab515 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M30.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M30.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M30V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M30S.py b/pyasic/miners/btc/_types/whatsminer/M3X/M30S.py similarity index 99% rename from pyasic/miners/_types/whatsminer/M3X/M30S.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M30S.py index 12ba84d6..13977f50 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M30S.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M30S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M30SV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M30S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus.py similarity index 99% rename from pyasic/miners/_types/whatsminer/M3X/M30S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus.py index 9427e180..bcce6e16 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M30S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M30SPlusV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M30S_Plus_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus_Plus.py similarity index 99% rename from pyasic/miners/_types/whatsminer/M3X/M30S_Plus_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus_Plus.py index 571442ed..7049392c 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M30S_Plus_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M30SPlusPlusV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M31.py b/pyasic/miners/btc/_types/whatsminer/M3X/M31.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M31.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M31.py index 8594d54b..9bc70e56 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M31.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M31.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M31V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M31H.py b/pyasic/miners/btc/_types/whatsminer/M3X/M31H.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M31H.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M31H.py index c3a0b760..49e50646 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M31H.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M31H.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M31HV40(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M31S.py b/pyasic/miners/btc/_types/whatsminer/M3X/M31S.py similarity index 99% rename from pyasic/miners/_types/whatsminer/M3X/M31S.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M31S.py index 45709480..ad6ed5f4 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M31S.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M31S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M31SV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M31SE.py b/pyasic/miners/btc/_types/whatsminer/M3X/M31SE.py similarity index 98% rename from pyasic/miners/_types/whatsminer/M3X/M31SE.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M31SE.py index 978a7ee5..a94f0f0a 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M31SE.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M31SE.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M31SEV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M31S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M31S_Plus.py similarity index 99% rename from pyasic/miners/_types/whatsminer/M3X/M31S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M31S_Plus.py index 1770c27e..ec61d1f3 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M31S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M31S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M31SPlusV10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M32.py b/pyasic/miners/btc/_types/whatsminer/M3X/M32.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M32.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M32.py index 4930c269..9941748f 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M32.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M32.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M32V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M32S.py b/pyasic/miners/btc/_types/whatsminer/M3X/M32S.py similarity index 96% rename from pyasic/miners/_types/whatsminer/M3X/M32S.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M32S.py index 35cff1d1..c3cf20d1 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M32S.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M32S.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M32S(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M33.py b/pyasic/miners/btc/_types/whatsminer/M3X/M33.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M33.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M33.py index 95f6b1ed..3f9e1e54 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M33.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M33.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M33V10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M33S.py b/pyasic/miners/btc/_types/whatsminer/M3X/M33S.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M33S.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M33S.py index b9be5a29..b470a2d3 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M33S.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M33S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M33SVG30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M33S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M33S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus.py index 81827a47..08079e7a 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M33S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M33SPlusVH20(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M33S_Plus_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus_Plus.py similarity index 98% rename from pyasic/miners/_types/whatsminer/M3X/M33S_Plus_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus_Plus.py index 82458653..4f228deb 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M33S_Plus_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M33SPlusPlusVH20(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M34S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M34S_Plus.py similarity index 96% rename from pyasic/miners/_types/whatsminer/M3X/M34S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M34S_Plus.py index fb19783d..27a76b31 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M34S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M34S_Plus.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M34SPlusVE10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M36S.py b/pyasic/miners/btc/_types/whatsminer/M3X/M36S.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M36S.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M36S.py index 1a2e2a70..45970f89 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M36S.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M36S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M36SVE10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M36S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M36S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus.py index 5a3f422e..888a0fb5 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M36S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M36SPlusVG30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M36S_Plus_Plus.py b/pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M36S_Plus_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus_Plus.py index 43940103..0e40012f 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M36S_Plus_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M36SPlusPlusVH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/M39.py b/pyasic/miners/btc/_types/whatsminer/M3X/M39.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M3X/M39.py rename to pyasic/miners/btc/_types/whatsminer/M3X/M39.py index fa498447..b4e58b91 100644 --- a/pyasic/miners/_types/whatsminer/M3X/M39.py +++ b/pyasic/miners/btc/_types/whatsminer/M3X/M39.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M39V20(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M3X/__init__.py b/pyasic/miners/btc/_types/whatsminer/M3X/__init__.py similarity index 100% rename from pyasic/miners/_types/whatsminer/M3X/__init__.py rename to pyasic/miners/btc/_types/whatsminer/M3X/__init__.py diff --git a/pyasic/miners/_types/whatsminer/M5X/M50.py b/pyasic/miners/btc/_types/whatsminer/M5X/M50.py similarity index 99% rename from pyasic/miners/_types/whatsminer/M5X/M50.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M50.py index 640715f6..3f9ce85b 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M50.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M50.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M50VG30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M50S.py b/pyasic/miners/btc/_types/whatsminer/M5X/M50S.py similarity index 98% rename from pyasic/miners/_types/whatsminer/M5X/M50S.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M50S.py index a2da58fa..7c6911d4 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M50S.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M50S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M50SVJ10(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M50S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus.py similarity index 98% rename from pyasic/miners/_types/whatsminer/M5X/M50S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus.py index a947e893..bd12f73d 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M50S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M50SPlusVH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M53.py b/pyasic/miners/btc/_types/whatsminer/M5X/M53.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M53.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M53.py index 7c96d714..6a944bcf 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M53.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M53.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M53VH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M53S.py b/pyasic/miners/btc/_types/whatsminer/M5X/M53S.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M53S.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M53S.py index 72105100..0ea2ecad 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M53S.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M53S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M53SVH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M53S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M5X/M53S_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M53S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M53S_Plus.py index 929d06b6..0d40d78e 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M53S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M53S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M53SPlusVJ30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M56.py b/pyasic/miners/btc/_types/whatsminer/M5X/M56.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M56.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M56.py index 974469aa..d49e0b10 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M56.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M56.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M56VH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M56S.py b/pyasic/miners/btc/_types/whatsminer/M5X/M56S.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M56S.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M56S.py index 46943a8e..a38f00c6 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M56S.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M56S.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M56SVH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M56S_Plus.py b/pyasic/miners/btc/_types/whatsminer/M5X/M56S_Plus.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M56S_Plus.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M56S_Plus.py index a9d8a3cd..76a0e807 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M56S_Plus.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M56S_Plus.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M56SPlusVJ30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/M59.py b/pyasic/miners/btc/_types/whatsminer/M5X/M59.py similarity index 97% rename from pyasic/miners/_types/whatsminer/M5X/M59.py rename to pyasic/miners/btc/_types/whatsminer/M5X/M59.py index f9114555..6a2c4e4e 100644 --- a/pyasic/miners/_types/whatsminer/M5X/M59.py +++ b/pyasic/miners/btc/_types/whatsminer/M5X/M59.py @@ -16,7 +16,7 @@ import warnings -from pyasic.miners._types.makes import WhatsMiner +from pyasic.miners.makes import WhatsMiner class M59VH30(WhatsMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/_types/whatsminer/M5X/__init__.py b/pyasic/miners/btc/_types/whatsminer/M5X/__init__.py similarity index 100% rename from pyasic/miners/_types/whatsminer/M5X/__init__.py rename to pyasic/miners/btc/_types/whatsminer/M5X/__init__.py diff --git a/pyasic/miners/_types/whatsminer/__init__.py b/pyasic/miners/btc/_types/whatsminer/__init__.py similarity index 100% rename from pyasic/miners/_types/whatsminer/__init__.py rename to pyasic/miners/btc/_types/whatsminer/__init__.py diff --git a/pyasic/miners/antminer/__init__.py b/pyasic/miners/btc/antminer/__init__.py similarity index 100% rename from pyasic/miners/antminer/__init__.py rename to pyasic/miners/btc/antminer/__init__.py diff --git a/pyasic/miners/antminer/bmminer/X17/S17.py b/pyasic/miners/btc/antminer/bmminer/X17/S17.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/S17.py rename to pyasic/miners/btc/antminer/bmminer/X17/S17.py index 33641695..de79a28a 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/S17.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import S17 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17 # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/S17_Plus.py b/pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/S17_Plus.py rename to pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py index ed1e391f..6ae14866 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17_Plus.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import S17Plus # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17Plus # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/S17_Pro.py b/pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/S17_Pro.py rename to pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py index 2b4c85d8..3c6cd203 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17_Pro.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import S17Pro # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17Pro # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/S17e.py b/pyasic/miners/btc/antminer/bmminer/X17/S17e.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/S17e.py rename to pyasic/miners/btc/antminer/bmminer/X17/S17e.py index a95f4b1f..1c040fef 100644 --- a/pyasic/miners/antminer/bmminer/X17/S17e.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/S17e.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import S17e # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17e # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/T17.py b/pyasic/miners/btc/antminer/bmminer/X17/T17.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/T17.py rename to pyasic/miners/btc/antminer/bmminer/X17/T17.py index 145f8de5..1a8ce2f8 100644 --- a/pyasic/miners/antminer/bmminer/X17/T17.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/T17.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import T17 # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17 # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/T17_Plus.py b/pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/T17_Plus.py rename to pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py index bbde9145..43cdcfd3 100644 --- a/pyasic/miners/antminer/bmminer/X17/T17_Plus.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import T17Plus # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17Plus # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/T17e.py b/pyasic/miners/btc/antminer/bmminer/X17/T17e.py similarity index 94% rename from pyasic/miners/antminer/bmminer/X17/T17e.py rename to pyasic/miners/btc/antminer/bmminer/X17/T17e.py index f2c3748c..07f0799a 100644 --- a/pyasic/miners/antminer/bmminer/X17/T17e.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/T17e.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import T17e # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17e # noqa - Ignore access to _module from .X17 import BMMinerX17 diff --git a/pyasic/miners/antminer/bmminer/X17/X17.py b/pyasic/miners/btc/antminer/bmminer/X17/X17.py similarity index 97% rename from pyasic/miners/antminer/bmminer/X17/X17.py rename to pyasic/miners/btc/antminer/bmminer/X17/X17.py index 8f45e346..21ce01d1 100644 --- a/pyasic/miners/antminer/bmminer/X17/X17.py +++ b/pyasic/miners/btc/antminer/bmminer/X17/X17.py @@ -16,7 +16,7 @@ from typing import Union -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module from pyasic.web.X17 import X17WebAPI diff --git a/pyasic/miners/antminer/bmminer/X17/__init__.py b/pyasic/miners/btc/antminer/bmminer/X17/__init__.py similarity index 100% rename from pyasic/miners/antminer/bmminer/X17/__init__.py rename to pyasic/miners/btc/antminer/bmminer/X17/__init__.py diff --git a/pyasic/miners/antminer/bmminer/X19/S19.py b/pyasic/miners/btc/antminer/bmminer/X19/S19.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19.py index e84bc727..714e4658 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/S19_Pro.py b/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19_Pro.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py index be52e35d..39ec0001 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19_Pro.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19Pro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/S19_XP.py b/pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19_XP.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py index 4c133d48..ee0ae761 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19_XP.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19XP # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19XP # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/S19a.py b/pyasic/miners/btc/antminer/bmminer/X19/S19a.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19a.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19a.py index c1ef5992..ff41d801 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19a.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19a.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19a # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19a # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/S19a_Pro.py b/pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19a_Pro.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py index b2ef6883..e559ce81 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19a_Pro.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19aPro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19aPro # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/S19j.py b/pyasic/miners/btc/antminer/bmminer/X19/S19j.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19j.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19j.py index 5399e40b..c842fb1f 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19j.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19j.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19j # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19j # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/S19j_Pro.py rename to pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py index 1e5ee4fb..00531dd1 100644 --- a/pyasic/miners/antminer/bmminer/X19/S19j_Pro.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import S19jPro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/T19.py b/pyasic/miners/btc/antminer/bmminer/X19/T19.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X19/T19.py rename to pyasic/miners/btc/antminer/bmminer/X19/T19.py index 06920591..e7c72e84 100644 --- a/pyasic/miners/antminer/bmminer/X19/T19.py +++ b/pyasic/miners/btc/antminer/bmminer/X19/T19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X19 # noqa - Ignore access to _module -from pyasic.miners._types import T19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import X19 # noqa - Ignore access to _module +from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X19/__init__.py b/pyasic/miners/btc/antminer/bmminer/X19/__init__.py similarity index 100% rename from pyasic/miners/antminer/bmminer/X19/__init__.py rename to pyasic/miners/btc/antminer/bmminer/X19/__init__.py diff --git a/pyasic/miners/antminer/bmminer/X9/S9.py b/pyasic/miners/btc/antminer/bmminer/X9/S9.py similarity index 92% rename from pyasic/miners/antminer/bmminer/X9/S9.py rename to pyasic/miners/btc/antminer/bmminer/X9/S9.py index 03f8a164..abfdf2d8 100644 --- a/pyasic/miners/antminer/bmminer/X9/S9.py +++ b/pyasic/miners/btc/antminer/bmminer/X9/S9.py @@ -16,8 +16,8 @@ from typing import Union -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module -from pyasic.miners._types import S9 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S9 # noqa - Ignore access to _module from pyasic.web.S9 import S9WebAPI diff --git a/pyasic/miners/antminer/bmminer/X9/S9i.py b/pyasic/miners/btc/antminer/bmminer/X9/S9i.py similarity index 88% rename from pyasic/miners/antminer/bmminer/X9/S9i.py rename to pyasic/miners/btc/antminer/bmminer/X9/S9i.py index 624591e8..c93ca80c 100644 --- a/pyasic/miners/antminer/bmminer/X9/S9i.py +++ b/pyasic/miners/btc/antminer/bmminer/X9/S9i.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module -from pyasic.miners._types import S9i # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S9i # noqa - Ignore access to _module class BMMinerS9i(BMMiner, S9i): diff --git a/pyasic/miners/antminer/bmminer/X9/T9.py b/pyasic/miners/btc/antminer/bmminer/X9/T9.py similarity index 88% rename from pyasic/miners/antminer/bmminer/X9/T9.py rename to pyasic/miners/btc/antminer/bmminer/X9/T9.py index 3efb6fd0..7e328a87 100644 --- a/pyasic/miners/antminer/bmminer/X9/T9.py +++ b/pyasic/miners/btc/antminer/bmminer/X9/T9.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module -from pyasic.miners._types import T9 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T9 # noqa - Ignore access to _module class BMMinerT9(BMMiner, T9): diff --git a/pyasic/miners/antminer/bmminer/X9/__init__.py b/pyasic/miners/btc/antminer/bmminer/X9/__init__.py similarity index 100% rename from pyasic/miners/antminer/bmminer/X9/__init__.py rename to pyasic/miners/btc/antminer/bmminer/X9/__init__.py diff --git a/pyasic/miners/_types/antminer/__init__.py b/pyasic/miners/btc/antminer/bmminer/__init__.py similarity index 97% rename from pyasic/miners/_types/antminer/__init__.py rename to pyasic/miners/btc/antminer/bmminer/__init__.py index bac87eb9..d4d4051b 100644 --- a/pyasic/miners/_types/antminer/__init__.py +++ b/pyasic/miners/btc/antminer/bmminer/__init__.py @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .X7 import * from .X9 import * -from .X15 import * from .X17 import * from .X19 import * diff --git a/pyasic/miners/antminer/bosminer/X17/S17.py b/pyasic/miners/btc/antminer/bosminer/X17/S17.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X17/S17.py rename to pyasic/miners/btc/antminer/bosminer/X17/S17.py index 31044099..c38465fa 100644 --- a/pyasic/miners/antminer/bosminer/X17/S17.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/S17.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17 # noqa - Ignore access to _module class BOSMinerS17(BOSMiner, S17): diff --git a/pyasic/miners/antminer/bosminer/X17/S17_Plus.py b/pyasic/miners/btc/antminer/bosminer/X17/S17_Plus.py similarity index 89% rename from pyasic/miners/antminer/bosminer/X17/S17_Plus.py rename to pyasic/miners/btc/antminer/bosminer/X17/S17_Plus.py index 807864b2..174697d9 100644 --- a/pyasic/miners/antminer/bosminer/X17/S17_Plus.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/S17_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17Plus # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17Plus # noqa - Ignore access to _module class BOSMinerS17Plus(BOSMiner, S17Plus): diff --git a/pyasic/miners/antminer/bosminer/X17/S17_Pro.py b/pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X17/S17_Pro.py rename to pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py index 99ce0cdf..0c8fd8b1 100644 --- a/pyasic/miners/antminer/bosminer/X17/S17_Pro.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17Pro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17Pro # noqa - Ignore access to _module class BOSMinerS17Pro(BOSMiner, S17Pro): diff --git a/pyasic/miners/antminer/bosminer/X17/S17e.py b/pyasic/miners/btc/antminer/bosminer/X17/S17e.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X17/S17e.py rename to pyasic/miners/btc/antminer/bosminer/X17/S17e.py index c9920d37..082e5865 100644 --- a/pyasic/miners/antminer/bosminer/X17/S17e.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/S17e.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17e # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17e # noqa - Ignore access to _module class BOSMinerS17e(BOSMiner, S17e): diff --git a/pyasic/miners/antminer/bosminer/X17/T17.py b/pyasic/miners/btc/antminer/bosminer/X17/T17.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X17/T17.py rename to pyasic/miners/btc/antminer/bosminer/X17/T17.py index b6602479..ffd89dda 100644 --- a/pyasic/miners/antminer/bosminer/X17/T17.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/T17.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import T17 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17 # noqa - Ignore access to _module class BOSMinerT17(BOSMiner, T17): diff --git a/pyasic/miners/antminer/bosminer/X17/T17_Plus.py b/pyasic/miners/btc/antminer/bosminer/X17/T17_Plus.py similarity index 89% rename from pyasic/miners/antminer/bosminer/X17/T17_Plus.py rename to pyasic/miners/btc/antminer/bosminer/X17/T17_Plus.py index cfc6130b..7b9462ef 100644 --- a/pyasic/miners/antminer/bosminer/X17/T17_Plus.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/T17_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import T17Plus # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17Plus # noqa - Ignore access to _module class BOSMinerT17Plus(BOSMiner, T17Plus): diff --git a/pyasic/miners/antminer/bosminer/X17/T17e.py b/pyasic/miners/btc/antminer/bosminer/X17/T17e.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X17/T17e.py rename to pyasic/miners/btc/antminer/bosminer/X17/T17e.py index ef711e0a..bb83ea1d 100644 --- a/pyasic/miners/antminer/bosminer/X17/T17e.py +++ b/pyasic/miners/btc/antminer/bosminer/X17/T17e.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import T17e # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17e # noqa - Ignore access to _module class BOSMinerT17e(BOSMiner, T17e): diff --git a/pyasic/miners/antminer/bosminer/X17/__init__.py b/pyasic/miners/btc/antminer/bosminer/X17/__init__.py similarity index 100% rename from pyasic/miners/antminer/bosminer/X17/__init__.py rename to pyasic/miners/btc/antminer/bosminer/X17/__init__.py diff --git a/pyasic/miners/antminer/bosminer/X19/S19.py b/pyasic/miners/btc/antminer/bosminer/X19/S19.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X19/S19.py rename to pyasic/miners/btc/antminer/bosminer/X19/S19.py index 5e13c69f..d7628067 100644 --- a/pyasic/miners/antminer/bosminer/X19/S19.py +++ b/pyasic/miners/btc/antminer/bosminer/X19/S19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module class BOSMinerS19(BOSMiner, S19): diff --git a/pyasic/miners/antminer/bosminer/X19/S19_Pro.py b/pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X19/S19_Pro.py rename to pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py index 2bf04693..74a1be98 100644 --- a/pyasic/miners/antminer/bosminer/X19/S19_Pro.py +++ b/pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19Pro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module class BOSMinerS19Pro(BOSMiner, S19Pro): diff --git a/pyasic/miners/antminer/bosminer/X19/S19j.py b/pyasic/miners/btc/antminer/bosminer/X19/S19j.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X19/S19j.py rename to pyasic/miners/btc/antminer/bosminer/X19/S19j.py index 701e3e57..9143d337 100644 --- a/pyasic/miners/antminer/bosminer/X19/S19j.py +++ b/pyasic/miners/btc/antminer/bosminer/X19/S19j.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19j # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19j # noqa - Ignore access to _module class BOSMinerS19j(BOSMiner, S19j): diff --git a/pyasic/miners/antminer/bosminer/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py similarity index 89% rename from pyasic/miners/antminer/bosminer/X19/S19j_Pro.py rename to pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py index 6d6d0dac..e7c6c6e4 100644 --- a/pyasic/miners/antminer/bosminer/X19/S19j_Pro.py +++ b/pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19jPro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module class BOSMinerS19jPro(BOSMiner, S19jPro): diff --git a/pyasic/miners/antminer/bosminer/X19/T19.py b/pyasic/miners/btc/antminer/bosminer/X19/T19.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X19/T19.py rename to pyasic/miners/btc/antminer/bosminer/X19/T19.py index d7565921..7d39479c 100644 --- a/pyasic/miners/antminer/bosminer/X19/T19.py +++ b/pyasic/miners/btc/antminer/bosminer/X19/T19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import T19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module class BOSMinerT19(BOSMiner, T19): diff --git a/pyasic/miners/antminer/bosminer/X19/__init__.py b/pyasic/miners/btc/antminer/bosminer/X19/__init__.py similarity index 100% rename from pyasic/miners/antminer/bosminer/X19/__init__.py rename to pyasic/miners/btc/antminer/bosminer/X19/__init__.py diff --git a/pyasic/miners/antminer/bosminer/X9/S9.py b/pyasic/miners/btc/antminer/bosminer/X9/S9.py similarity index 88% rename from pyasic/miners/antminer/bosminer/X9/S9.py rename to pyasic/miners/btc/antminer/bosminer/X9/S9.py index c91a6c48..a285c315 100644 --- a/pyasic/miners/antminer/bosminer/X9/S9.py +++ b/pyasic/miners/btc/antminer/bosminer/X9/S9.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BOSMiner # noqa - Ignore access to _module -from pyasic.miners._types import S9 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S9 # noqa - Ignore access to _module class BOSMinerS9(BOSMiner, S9): diff --git a/pyasic/miners/antminer/bosminer/X9/__init__.py b/pyasic/miners/btc/antminer/bosminer/X9/__init__.py similarity index 100% rename from pyasic/miners/antminer/bosminer/X9/__init__.py rename to pyasic/miners/btc/antminer/bosminer/X9/__init__.py diff --git a/pyasic/miners/antminer/bosminer/__init__.py b/pyasic/miners/btc/antminer/bosminer/__init__.py similarity index 100% rename from pyasic/miners/antminer/bosminer/__init__.py rename to pyasic/miners/btc/antminer/bosminer/__init__.py diff --git a/pyasic/miners/antminer/cgminer/X17/S17.py b/pyasic/miners/btc/antminer/cgminer/X17/S17.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X17/S17.py rename to pyasic/miners/btc/antminer/cgminer/X17/S17.py index 342b8b5e..35a9920a 100644 --- a/pyasic/miners/antminer/cgminer/X17/S17.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/S17.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17 # noqa - Ignore access to _module class CGMinerS17(CGMiner, S17): diff --git a/pyasic/miners/antminer/cgminer/X17/S17_Plus.py b/pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X17/S17_Plus.py rename to pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py index 915dac8e..ac2c17f9 100644 --- a/pyasic/miners/antminer/cgminer/X17/S17_Plus.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17Plus # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17Plus # noqa - Ignore access to _module class CGMinerS17Plus(CGMiner, S17Plus): diff --git a/pyasic/miners/antminer/cgminer/X17/S17_Pro.py b/pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py similarity index 89% rename from pyasic/miners/antminer/cgminer/X17/S17_Pro.py rename to pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py index ad791c18..f56a894a 100644 --- a/pyasic/miners/antminer/cgminer/X17/S17_Pro.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17Pro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17Pro # noqa - Ignore access to _module class CGMinerS17Pro(CGMiner, S17Pro): diff --git a/pyasic/miners/antminer/cgminer/X17/S17e.py b/pyasic/miners/btc/antminer/cgminer/X17/S17e.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X17/S17e.py rename to pyasic/miners/btc/antminer/cgminer/X17/S17e.py index cd3ba9af..030e03b5 100644 --- a/pyasic/miners/antminer/cgminer/X17/S17e.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/S17e.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S17e # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S17e # noqa - Ignore access to _module class CGMinerS17e(CGMiner, S17e): diff --git a/pyasic/miners/antminer/cgminer/X17/T17.py b/pyasic/miners/btc/antminer/cgminer/X17/T17.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X17/T17.py rename to pyasic/miners/btc/antminer/cgminer/X17/T17.py index e6bbd62e..b345cc0e 100644 --- a/pyasic/miners/antminer/cgminer/X17/T17.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/T17.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import T17 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17 # noqa - Ignore access to _module class CGMinerT17(CGMiner, T17): diff --git a/pyasic/miners/antminer/cgminer/X17/T17_Plus.py b/pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X17/T17_Plus.py rename to pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py index f575e658..ea5c3030 100644 --- a/pyasic/miners/antminer/cgminer/X17/T17_Plus.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import T17Plus # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17Plus # noqa - Ignore access to _module class CGMinerT17Plus(CGMiner, T17Plus): diff --git a/pyasic/miners/antminer/cgminer/X17/T17e.py b/pyasic/miners/btc/antminer/cgminer/X17/T17e.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X17/T17e.py rename to pyasic/miners/btc/antminer/cgminer/X17/T17e.py index 56af5f70..eb7e9bd1 100644 --- a/pyasic/miners/antminer/cgminer/X17/T17e.py +++ b/pyasic/miners/btc/antminer/cgminer/X17/T17e.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import T17e # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T17e # noqa - Ignore access to _module class CGMinerT17e(CGMiner, T17e): diff --git a/pyasic/miners/antminer/cgminer/X17/__init__.py b/pyasic/miners/btc/antminer/cgminer/X17/__init__.py similarity index 100% rename from pyasic/miners/antminer/cgminer/X17/__init__.py rename to pyasic/miners/btc/antminer/cgminer/X17/__init__.py diff --git a/pyasic/miners/antminer/cgminer/X19/S19.py b/pyasic/miners/btc/antminer/cgminer/X19/S19.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X19/S19.py rename to pyasic/miners/btc/antminer/cgminer/X19/S19.py index 48baea39..8396d297 100644 --- a/pyasic/miners/antminer/cgminer/X19/S19.py +++ b/pyasic/miners/btc/antminer/cgminer/X19/S19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module class CGMinerS19(CGMiner, S19): diff --git a/pyasic/miners/antminer/cgminer/X19/S19_Pro.py b/pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py similarity index 89% rename from pyasic/miners/antminer/cgminer/X19/S19_Pro.py rename to pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py index 04cc7fb5..ac4f2167 100644 --- a/pyasic/miners/antminer/cgminer/X19/S19_Pro.py +++ b/pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19Pro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module class CGMinerS19Pro(CGMiner, S19Pro): diff --git a/pyasic/miners/antminer/cgminer/X19/S19j.py b/pyasic/miners/btc/antminer/cgminer/X19/S19j.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X19/S19j.py rename to pyasic/miners/btc/antminer/cgminer/X19/S19j.py index c08b4456..be1f7b64 100644 --- a/pyasic/miners/antminer/cgminer/X19/S19j.py +++ b/pyasic/miners/btc/antminer/cgminer/X19/S19j.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19j # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19j # noqa - Ignore access to _module class CGMinerS19j(CGMiner, S19j): diff --git a/pyasic/miners/antminer/cgminer/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X19/S19j_Pro.py rename to pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py index c66e4d69..175b0b9e 100644 --- a/pyasic/miners/antminer/cgminer/X19/S19j_Pro.py +++ b/pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S19jPro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module class CGMinerS19jPro(CGMiner, S19jPro): diff --git a/pyasic/miners/antminer/cgminer/X19/T19.py b/pyasic/miners/btc/antminer/cgminer/X19/T19.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X19/T19.py rename to pyasic/miners/btc/antminer/cgminer/X19/T19.py index 730fc9a9..4b956d91 100644 --- a/pyasic/miners/antminer/cgminer/X19/T19.py +++ b/pyasic/miners/btc/antminer/cgminer/X19/T19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import T19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module class CGMinerT19(CGMiner, T19): diff --git a/pyasic/miners/antminer/cgminer/X19/__init__.py b/pyasic/miners/btc/antminer/cgminer/X19/__init__.py similarity index 100% rename from pyasic/miners/antminer/cgminer/X19/__init__.py rename to pyasic/miners/btc/antminer/cgminer/X19/__init__.py diff --git a/pyasic/miners/antminer/cgminer/X9/S9.py b/pyasic/miners/btc/antminer/cgminer/X9/S9.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X9/S9.py rename to pyasic/miners/btc/antminer/cgminer/X9/S9.py index 6ef3ba1d..c620c554 100644 --- a/pyasic/miners/antminer/cgminer/X9/S9.py +++ b/pyasic/miners/btc/antminer/cgminer/X9/S9.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import S9 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import S9 # noqa - Ignore access to _module class CGMinerS9(CGMiner, S9): diff --git a/pyasic/miners/antminer/cgminer/X9/T9.py b/pyasic/miners/btc/antminer/cgminer/X9/T9.py similarity index 88% rename from pyasic/miners/antminer/cgminer/X9/T9.py rename to pyasic/miners/btc/antminer/cgminer/X9/T9.py index 9248922f..f19cecd9 100644 --- a/pyasic/miners/antminer/cgminer/X9/T9.py +++ b/pyasic/miners/btc/antminer/cgminer/X9/T9.py @@ -14,8 +14,10 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends.cgminer import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types.antminer import T9 # noqa - Ignore access to _module +from pyasic.miners.btc._backends.cgminer import ( # noqa - Ignore access to _module + CGMiner, +) +from pyasic.miners.btc._types.antminer import T9 # noqa - Ignore access to _module class CGMinerT9(CGMiner, T9): diff --git a/pyasic/miners/antminer/cgminer/X9/__init__.py b/pyasic/miners/btc/antminer/cgminer/X9/__init__.py similarity index 100% rename from pyasic/miners/antminer/cgminer/X9/__init__.py rename to pyasic/miners/btc/antminer/cgminer/X9/__init__.py diff --git a/pyasic/miners/antminer/cgminer/__init__.py b/pyasic/miners/btc/antminer/cgminer/__init__.py similarity index 98% rename from pyasic/miners/antminer/cgminer/__init__.py rename to pyasic/miners/btc/antminer/cgminer/__init__.py index f1bc3e6a..2d43e0e4 100644 --- a/pyasic/miners/antminer/cgminer/__init__.py +++ b/pyasic/miners/btc/antminer/cgminer/__init__.py @@ -15,6 +15,5 @@ # ------------------------------------------------------------------------------ from .X9 import * -from .X15 import * from .X17 import * from .X19 import * diff --git a/pyasic/miners/antminer/hiveon/X9/T9.py b/pyasic/miners/btc/antminer/hiveon/X9/T9.py similarity index 96% rename from pyasic/miners/antminer/hiveon/X9/T9.py rename to pyasic/miners/btc/antminer/hiveon/X9/T9.py index 6440ad1d..707db651 100644 --- a/pyasic/miners/antminer/hiveon/X9/T9.py +++ b/pyasic/miners/btc/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._types import T9 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import Hiveon # noqa - Ignore access to _module +from pyasic.miners.btc._types import T9 # noqa - Ignore access to _module class HiveonT9(Hiveon, T9): diff --git a/pyasic/miners/antminer/hiveon/X9/__init__.py b/pyasic/miners/btc/antminer/hiveon/X9/__init__.py similarity index 100% rename from pyasic/miners/antminer/hiveon/X9/__init__.py rename to pyasic/miners/btc/antminer/hiveon/X9/__init__.py diff --git a/pyasic/miners/antminer/hiveon/__init__.py b/pyasic/miners/btc/antminer/hiveon/__init__.py similarity index 100% rename from pyasic/miners/antminer/hiveon/__init__.py rename to pyasic/miners/btc/antminer/hiveon/__init__.py diff --git a/pyasic/miners/antminer/vnish/X19/S19.py b/pyasic/miners/btc/antminer/vnish/X19/S19.py similarity index 88% rename from pyasic/miners/antminer/vnish/X19/S19.py rename to pyasic/miners/btc/antminer/vnish/X19/S19.py index 103dbd23..d79af812 100644 --- a/pyasic/miners/antminer/vnish/X19/S19.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module class VNishS19(VNish, S19): diff --git a/pyasic/miners/antminer/vnish/X19/S19_Pro.py b/pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py similarity index 88% rename from pyasic/miners/antminer/vnish/X19/S19_Pro.py rename to pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py index 08da0cc2..5dea19ac 100644 --- a/pyasic/miners/antminer/vnish/X19/S19_Pro.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19Pro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module class VNishS19Pro(VNish, S19Pro): diff --git a/pyasic/miners/antminer/vnish/X19/S19_XP.py b/pyasic/miners/btc/antminer/vnish/X19/S19_XP.py similarity index 88% rename from pyasic/miners/antminer/vnish/X19/S19_XP.py rename to pyasic/miners/btc/antminer/vnish/X19/S19_XP.py index 7de67fe7..77a5f862 100644 --- a/pyasic/miners/antminer/vnish/X19/S19_XP.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19_XP.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19XP # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19XP # noqa - Ignore access to _module class VNishS19XP(VNish, S19XP): diff --git a/pyasic/miners/antminer/vnish/X19/S19a.py b/pyasic/miners/btc/antminer/vnish/X19/S19a.py similarity index 89% rename from pyasic/miners/antminer/vnish/X19/S19a.py rename to pyasic/miners/btc/antminer/vnish/X19/S19a.py index a00edfe3..45868e31 100644 --- a/pyasic/miners/antminer/vnish/X19/S19a.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19a.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19a # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19a # noqa - Ignore access to _module class VNishS19a(VNish, S19a): diff --git a/pyasic/miners/antminer/vnish/X19/S19a_Pro.py b/pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py similarity index 88% rename from pyasic/miners/antminer/vnish/X19/S19a_Pro.py rename to pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py index e7d4108f..32df4778 100644 --- a/pyasic/miners/antminer/vnish/X19/S19a_Pro.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19aPro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19aPro # noqa - Ignore access to _module class VNishS19aPro(VNish, S19aPro): diff --git a/pyasic/miners/antminer/vnish/X19/S19j.py b/pyasic/miners/btc/antminer/vnish/X19/S19j.py similarity index 89% rename from pyasic/miners/antminer/vnish/X19/S19j.py rename to pyasic/miners/btc/antminer/vnish/X19/S19j.py index 066a8389..d242505e 100644 --- a/pyasic/miners/antminer/vnish/X19/S19j.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19j.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19j # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19j # noqa - Ignore access to _module class VNishS19j(VNish, S19j): diff --git a/pyasic/miners/antminer/vnish/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/vnish/X19/S19j_Pro.py similarity index 88% rename from pyasic/miners/antminer/vnish/X19/S19j_Pro.py rename to pyasic/miners/btc/antminer/vnish/X19/S19j_Pro.py index 6f62ac3a..18069d96 100644 --- a/pyasic/miners/antminer/vnish/X19/S19j_Pro.py +++ b/pyasic/miners/btc/antminer/vnish/X19/S19j_Pro.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import S19jPro # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module class VNishS19jPro(VNish, S19jPro): diff --git a/pyasic/miners/antminer/vnish/X19/T19.py b/pyasic/miners/btc/antminer/vnish/X19/T19.py similarity index 88% rename from pyasic/miners/antminer/vnish/X19/T19.py rename to pyasic/miners/btc/antminer/vnish/X19/T19.py index 8124bf80..d8c0803a 100644 --- a/pyasic/miners/antminer/vnish/X19/T19.py +++ b/pyasic/miners/btc/antminer/vnish/X19/T19.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import VNish # noqa - Ignore access to _module -from pyasic.miners._types import T19 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import VNish # noqa - Ignore access to _module +from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module class VNishT19(VNish, T19): diff --git a/pyasic/miners/antminer/vnish/X19/__init__.py b/pyasic/miners/btc/antminer/vnish/X19/__init__.py similarity index 100% rename from pyasic/miners/antminer/vnish/X19/__init__.py rename to pyasic/miners/btc/antminer/vnish/X19/__init__.py diff --git a/pyasic/miners/antminer/vnish/__init__.py b/pyasic/miners/btc/antminer/vnish/__init__.py similarity index 100% rename from pyasic/miners/antminer/vnish/__init__.py rename to pyasic/miners/btc/antminer/vnish/__init__.py diff --git a/pyasic/miners/avalonminer/__init__.py b/pyasic/miners/btc/avalonminer/__init__.py similarity index 100% rename from pyasic/miners/avalonminer/__init__.py rename to pyasic/miners/btc/avalonminer/__init__.py diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A1026.py b/pyasic/miners/btc/avalonminer/cgminer/A10X/A1026.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A10X/A1026.py rename to pyasic/miners/btc/avalonminer/cgminer/A10X/A1026.py index 243ca174..40734a36 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A1026.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A10X/A1026.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon1026 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon1026 # noqa - Ignore access to _module from .A10X import CGMinerA10X diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A1047.py b/pyasic/miners/btc/avalonminer/cgminer/A10X/A1047.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A10X/A1047.py rename to pyasic/miners/btc/avalonminer/cgminer/A10X/A1047.py index ec9fa0a9..93065736 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A1047.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A10X/A1047.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon1047 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon1047 # noqa - Ignore access to _module from .A10X import CGMinerA10X diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A1066.py b/pyasic/miners/btc/avalonminer/cgminer/A10X/A1066.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A10X/A1066.py rename to pyasic/miners/btc/avalonminer/cgminer/A10X/A1066.py index d323325e..6e33496e 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A1066.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A10X/A1066.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon1066 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon1066 # noqa - Ignore access to _module from .A10X import CGMinerA10X diff --git a/pyasic/miners/avalonminer/cgminer/A10X/A10X.py b/pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py similarity index 93% rename from pyasic/miners/avalonminer/cgminer/A10X/A10X.py rename to pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py index 4b612172..6731e335 100644 --- a/pyasic/miners/avalonminer/cgminer/A10X/A10X.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMinerAvalon # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMinerAvalon # noqa - Ignore access to _module class CGMinerA10X(CGMinerAvalon): diff --git a/pyasic/miners/avalonminer/cgminer/A10X/__init__.py b/pyasic/miners/btc/avalonminer/cgminer/A10X/__init__.py similarity index 100% rename from pyasic/miners/avalonminer/cgminer/A10X/__init__.py rename to pyasic/miners/btc/avalonminer/cgminer/A10X/__init__.py diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A721.py b/pyasic/miners/btc/avalonminer/cgminer/A7X/A721.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A7X/A721.py rename to pyasic/miners/btc/avalonminer/cgminer/A7X/A721.py index 58ecb9f5..48db64ba 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A721.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A7X/A721.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon721 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon721 # noqa - Ignore access to _module from .A7X import CGMinerA7X # noqa - Ignore access to _module diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A741.py b/pyasic/miners/btc/avalonminer/cgminer/A7X/A741.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A7X/A741.py rename to pyasic/miners/btc/avalonminer/cgminer/A7X/A741.py index d72c29dc..ce12ae0f 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A741.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A7X/A741.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon741 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon741 # noqa - Ignore access to _module from .A7X import CGMinerA7X # noqa - Ignore access to _module diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A761.py b/pyasic/miners/btc/avalonminer/cgminer/A7X/A761.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A7X/A761.py rename to pyasic/miners/btc/avalonminer/cgminer/A7X/A761.py index 8959de24..68a04a32 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A761.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A7X/A761.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon761 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon761 # noqa - Ignore access to _module from .A7X import CGMinerA7X # noqa - Ignore access to _module diff --git a/pyasic/miners/avalonminer/cgminer/A7X/A7X.py b/pyasic/miners/btc/avalonminer/cgminer/A7X/A7X.py similarity index 93% rename from pyasic/miners/avalonminer/cgminer/A7X/A7X.py rename to pyasic/miners/btc/avalonminer/cgminer/A7X/A7X.py index fac4a239..80078ea3 100644 --- a/pyasic/miners/avalonminer/cgminer/A7X/A7X.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A7X/A7X.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMinerAvalon # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMinerAvalon # noqa - Ignore access to _module class CGMinerA7X(CGMinerAvalon): diff --git a/pyasic/miners/avalonminer/cgminer/A7X/__init__.py b/pyasic/miners/btc/avalonminer/cgminer/A7X/__init__.py similarity index 100% rename from pyasic/miners/avalonminer/cgminer/A7X/__init__.py rename to pyasic/miners/btc/avalonminer/cgminer/A7X/__init__.py diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A821.py b/pyasic/miners/btc/avalonminer/cgminer/A8X/A821.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A8X/A821.py rename to pyasic/miners/btc/avalonminer/cgminer/A8X/A821.py index 58f30675..0f323d13 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A821.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A8X/A821.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon821 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon821 # noqa - Ignore access to _module from .A8X import CGMinerA8X # noqa - Ignore access to _module diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A841.py b/pyasic/miners/btc/avalonminer/cgminer/A8X/A841.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A8X/A841.py rename to pyasic/miners/btc/avalonminer/cgminer/A8X/A841.py index 05de50a9..2d3691a9 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A841.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A8X/A841.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon841 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon841 # noqa - Ignore access to _module from .A8X import CGMinerA8X # noqa - Ignore access to _module diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A851.py b/pyasic/miners/btc/avalonminer/cgminer/A8X/A851.py similarity index 94% rename from pyasic/miners/avalonminer/cgminer/A8X/A851.py rename to pyasic/miners/btc/avalonminer/cgminer/A8X/A851.py index 89f31624..0a7b8716 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A851.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A8X/A851.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types import Avalon851 # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon851 # noqa - Ignore access to _module from .A8X import CGMinerA8X # noqa - Ignore access to _module diff --git a/pyasic/miners/avalonminer/cgminer/A8X/A8X.py b/pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py similarity index 93% rename from pyasic/miners/avalonminer/cgminer/A8X/A8X.py rename to pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py index b12da63b..02f4092c 100644 --- a/pyasic/miners/avalonminer/cgminer/A8X/A8X.py +++ b/pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import CGMinerAvalon # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMinerAvalon # noqa - Ignore access to _module class CGMinerA8X(CGMinerAvalon): diff --git a/pyasic/miners/avalonminer/cgminer/A8X/__init__.py b/pyasic/miners/btc/avalonminer/cgminer/A8X/__init__.py similarity index 100% rename from pyasic/miners/avalonminer/cgminer/A8X/__init__.py rename to pyasic/miners/btc/avalonminer/cgminer/A8X/__init__.py diff --git a/pyasic/miners/avalonminer/cgminer/A9X/A921.py b/pyasic/miners/btc/avalonminer/cgminer/A9X/A921.py similarity index 88% rename from pyasic/miners/avalonminer/cgminer/A9X/A921.py rename to pyasic/miners/btc/avalonminer/cgminer/A9X/A921.py index 015bbe34..21c81c4c 100644 --- a/pyasic/miners/avalonminer/cgminer/A9X/A921.py +++ b/pyasic/miners/btc/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._types import Avalon921 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMinerAvalon # noqa - Ignore access to _module +from pyasic.miners.btc._types import Avalon921 # noqa - Ignore access to _module class CGMinerAvalon921(CGMinerAvalon, Avalon921): diff --git a/pyasic/miners/avalonminer/cgminer/A9X/__init__.py b/pyasic/miners/btc/avalonminer/cgminer/A9X/__init__.py similarity index 100% rename from pyasic/miners/avalonminer/cgminer/A9X/__init__.py rename to pyasic/miners/btc/avalonminer/cgminer/A9X/__init__.py diff --git a/pyasic/miners/avalonminer/cgminer/__init__.py b/pyasic/miners/btc/avalonminer/cgminer/__init__.py similarity index 100% rename from pyasic/miners/avalonminer/cgminer/__init__.py rename to pyasic/miners/btc/avalonminer/cgminer/__init__.py diff --git a/pyasic/miners/innosilicon/__init__.py b/pyasic/miners/btc/innosilicon/__init__.py similarity index 100% rename from pyasic/miners/innosilicon/__init__.py rename to pyasic/miners/btc/innosilicon/__init__.py diff --git a/pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py b/pyasic/miners/btc/innosilicon/cgminer/T3X/T3H_Plus.py similarity index 98% rename from pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py rename to pyasic/miners/btc/innosilicon/cgminer/T3X/T3H_Plus.py index 4e766b56..b186e69d 100644 --- a/pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py +++ b/pyasic/miners/btc/innosilicon/cgminer/T3X/T3H_Plus.py @@ -20,8 +20,10 @@ from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.data.error_codes import InnosiliconError, MinerErrorData from pyasic.errors import APIError -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.miners._types import InnosiliconT3HPlus # noqa - Ignore access to _module +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module + InnosiliconT3HPlus, +) from pyasic.web.Inno import InnosiliconWebAPI diff --git a/pyasic/miners/innosilicon/cgminer/T3X/__init__.py b/pyasic/miners/btc/innosilicon/cgminer/T3X/__init__.py similarity index 100% rename from pyasic/miners/innosilicon/cgminer/T3X/__init__.py rename to pyasic/miners/btc/innosilicon/cgminer/T3X/__init__.py diff --git a/pyasic/miners/innosilicon/cgminer/__init__.py b/pyasic/miners/btc/innosilicon/cgminer/__init__.py similarity index 100% rename from pyasic/miners/innosilicon/cgminer/__init__.py rename to pyasic/miners/btc/innosilicon/cgminer/__init__.py diff --git a/pyasic/miners/whatsminer/__init__.py b/pyasic/miners/btc/whatsminer/__init__.py similarity index 100% rename from pyasic/miners/whatsminer/__init__.py rename to pyasic/miners/btc/whatsminer/__init__.py diff --git a/pyasic/miners/whatsminer/btminer/M2X/M20.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M20.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M2X/M20.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M20.py index c7af35ce..b42ec33d 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M20.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M20.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M20V10 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M20V10 # noqa - Ignore access to _module class BTMinerM20V10(BTMiner, M20V10): diff --git a/pyasic/miners/whatsminer/btminer/M2X/M20S.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M20S.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M2X/M20S.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M20S.py index 7ff56bec..9c8351c7 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M20S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M20S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M20SV10, M20SV20, M20SV30, diff --git a/pyasic/miners/whatsminer/btminer/M2X/M20S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M20S_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M2X/M20S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M20S_Plus.py index 9a01dffc..a3f48b6c 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M20S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M20S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M20SPlusV30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M20SPlusV30 # noqa - Ignore access to _module class BTMinerM20SPlusV30(BTMiner, M20SPlusV30): diff --git a/pyasic/miners/whatsminer/btminer/M2X/M21.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M21.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M2X/M21.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M21.py index 646b576a..64b7f580 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M21.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M21.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M21V10 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M21V10 # noqa - Ignore access to _module class BTMinerM21V10(BTMiner, M21V10): diff --git a/pyasic/miners/whatsminer/btminer/M2X/M21S.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M21S.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M2X/M21S.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M21S.py index 938301ca..0b4ad926 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M21S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M21S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M21SV20, M21SV60, M21SV70, diff --git a/pyasic/miners/whatsminer/btminer/M2X/M21S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M21S_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M2X/M21S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M21S_Plus.py index 04740d2e..ce9594d6 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M21S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M21S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M21SPlusV20 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M21SPlusV20 # noqa - Ignore access to _module class BTMinerM21SPlusV20(BTMiner, M21SPlusV20): diff --git a/pyasic/miners/whatsminer/btminer/M2X/M29.py b/pyasic/miners/btc/whatsminer/btminer/M2X/M29.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M2X/M29.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/M29.py index ad38f815..0715b040 100644 --- a/pyasic/miners/whatsminer/btminer/M2X/M29.py +++ b/pyasic/miners/btc/whatsminer/btminer/M2X/M29.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M29V10 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M29V10 # noqa - Ignore access to _module class BTMinerM29V10(BTMiner, M29V10): diff --git a/pyasic/miners/whatsminer/btminer/M2X/__init__.py b/pyasic/miners/btc/whatsminer/btminer/M2X/__init__.py similarity index 100% rename from pyasic/miners/whatsminer/btminer/M2X/__init__.py rename to pyasic/miners/btc/whatsminer/btminer/M2X/__init__.py diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M30.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M3X/M30.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M30.py index d3f64853..c8f53218 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M30.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M30V10, M30V20 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M30V10, M30V20 # noqa - Ignore access to _module class BTMinerM30V10(BTMiner, M30V10): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30S.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M30S.py similarity index 95% rename from pyasic/miners/whatsminer/btminer/M3X/M30S.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M30S.py index afeee798..4c3eb865 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M30S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M30SV10, M30SV20, M30SV30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus.py similarity index 95% rename from pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus.py index db5d538b..c95406f7 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M30SPlusV10, M30SPlusV20, M30SPlusV30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus_Plus.py similarity index 95% rename from pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus_Plus.py index 86b893c0..ec673955 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M30SPlusPlusV10, M30SPlusPlusV20, M30SPlusPlusVE30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M31.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M31.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M3X/M31.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M31.py index 311e97a7..24d08333 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M31.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M31.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M31V10, M31V20 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M31V10, M31V20 # noqa - Ignore access to _module class BTMinerM31V10(BTMiner, M31V10): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M31H.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M31H.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M31H.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M31H.py index a14f5e03..0e4b6fa2 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M31H.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M31H.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M31HV40 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M31HV40 # noqa - Ignore access to _module class BTMinerM31HV40(BTMiner, M31HV40): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M31S.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M31S.py similarity index 92% rename from pyasic/miners/whatsminer/btminer/M3X/M31S.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M31S.py index 0470ef7f..c08239a1 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M31S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M31S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M31SV10, M31SV20, M31SV30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M31SE.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M31SE.py similarity index 90% rename from pyasic/miners/whatsminer/btminer/M3X/M31SE.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M31SE.py index efac7c66..9c843e59 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M31SE.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M31SE.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M31SEV10, M31SEV20, M31SEV30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M31S_Plus.py similarity index 94% rename from pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M31S_Plus.py index dc33221a..d0feeba4 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M31S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M31SPlusV10, M31SPlusV20, M31SPlusV30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M32.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M32.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M3X/M32.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M32.py index c238c3e7..4f3a281b 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M32.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M32.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M32V10, M32V20 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M32V10, M32V20 # noqa - Ignore access to _module class BTMinerM32V10(BTMiner, M32V10): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M32S.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M32S.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M32S.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M32S.py index 5ca16a65..8aa17383 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M32S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M32S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M32S # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M32S # noqa - Ignore access to _module class BTMinerM32S(BTMiner, M32S): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M33.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M33.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M3X/M33.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M33.py index 13893427..10b42111 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M33.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M33.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M33V10, M33V20, M33V30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M33S.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M33S.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M33S.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M33S.py index 002cc4b4..c15c248a 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M33S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M33S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M33SVG30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M33SVG30 # noqa - Ignore access to _module class BTMinerM33SVG30(BTMiner, M33SVG30): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus.py index 029e6956..55c24350 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M33SPlusVH20, M33SPlusVH30, ) diff --git a/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus_Plus.py similarity index 90% rename from pyasic/miners/whatsminer/btminer/M3X/M33S_Plus_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus_Plus.py index 4105e8e5..d137753f 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M33SPlusPlusVG40, M33SPlusPlusVH20, M33SPlusPlusVH30, diff --git a/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M34S_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M34S_Plus.py index a500d86e..82f5921c 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M34S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M34SPlusVE10 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M34SPlusVE10 # noqa - Ignore access to _module class BTMinerM34SPlusVE10(BTMiner, M34SPlusVE10): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M36S.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M36S.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M36S.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M36S.py index ada5b3cf..85425ab6 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M36S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M36S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M36SVE10 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M36SVE10 # noqa - Ignore access to _module class BTMinerM36SVE10(BTMiner, M36SVE10): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M36S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus.py index 278853e4..ac92ed64 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M36SPlusVG30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M36SPlusVG30 # noqa - Ignore access to _module class BTMinerM36SPlusVG30(BTMiner, M36SPlusVG30): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M3X/M36S_Plus_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus_Plus.py index 4f1cbec5..9a541a03 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M36SPlusPlusVH30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M36SPlusPlusVH30 # noqa - Ignore access to _module class BTMinerM36SPlusPlusVH30(BTMiner, M36SPlusPlusVH30): diff --git a/pyasic/miners/whatsminer/btminer/M3X/M39.py b/pyasic/miners/btc/whatsminer/btminer/M3X/M39.py similarity index 89% rename from pyasic/miners/whatsminer/btminer/M3X/M39.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/M39.py index 8554b042..74e76a2f 100644 --- a/pyasic/miners/whatsminer/btminer/M3X/M39.py +++ b/pyasic/miners/btc/whatsminer/btminer/M3X/M39.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M39V20 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M39V20 # noqa - Ignore access to _module class BTMinerM39V20(BTMiner, M39V20): diff --git a/pyasic/miners/whatsminer/btminer/M3X/__init__.py b/pyasic/miners/btc/whatsminer/btminer/M3X/__init__.py similarity index 100% rename from pyasic/miners/whatsminer/btminer/M3X/__init__.py rename to pyasic/miners/btc/whatsminer/btminer/M3X/__init__.py diff --git a/pyasic/miners/whatsminer/btminer/M5X/M50.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M50.py similarity index 92% rename from pyasic/miners/whatsminer/btminer/M5X/M50.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M50.py index 29be6ef2..6b29b745 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M50.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M50.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M50VG30, M50VH10, M50VH20, diff --git a/pyasic/miners/whatsminer/btminer/M5X/M50S.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M50S.py similarity index 91% rename from pyasic/miners/whatsminer/btminer/M5X/M50S.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M50S.py index c3f238f4..e6f75247 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M50S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M50S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M50SVH10, M50SVH20, M50SVH30, diff --git a/pyasic/miners/whatsminer/btminer/M5X/M50S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus.py similarity index 90% rename from pyasic/miners/whatsminer/btminer/M5X/M50S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus.py index 2bcd35d7..85b4ce61 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M50S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import ( # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import ( # noqa - Ignore access to _module M50SPlusVH30, M50SPlusVH40, M50SPlusVJ30, diff --git a/pyasic/miners/whatsminer/btminer/M5X/M53.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M53.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M53.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M53.py index 64ccf714..3a395dd7 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M53.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M53.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M53VH30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M53VH30 # noqa - Ignore access to _module class BTMinerM53VH30(BTMiner, M53VH30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/M53S.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M53S.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M53S.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M53S.py index c034ac67..f51a6532 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M53S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M53S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M53SVH30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M53SVH30 # noqa - Ignore access to _module class BTMinerM53SVH30(BTMiner, M53SVH30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/M53S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M53S_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M53S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M53S_Plus.py index 90d80c06..1c04a82e 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M53S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M53S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M53SPlusVJ30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M53SPlusVJ30 # noqa - Ignore access to _module class BTMinerM53SPlusVJ30(BTMiner, M53SPlusVJ30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/M56.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M56.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M56.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M56.py index a9cb106f..8081d2b1 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M56.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M56.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M56VH30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M56VH30 # noqa - Ignore access to _module class BTMinerM56VH30(BTMiner, M56VH30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/M56S.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M56S.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M56S.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M56S.py index 50b5cda4..e5adcdd4 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M56S.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M56S.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M56SVH30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M56SVH30 # noqa - Ignore access to _module class BTMinerM56SVH30(BTMiner, M56SVH30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/M56S_Plus.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M56S_Plus.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M56S_Plus.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M56S_Plus.py index f5c94fdc..685396c7 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M56S_Plus.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M56S_Plus.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M56SPlusVJ30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M56SPlusVJ30 # noqa - Ignore access to _module class BTMinerM56SPlusVJ30(BTMiner, M56SPlusVJ30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/M59.py b/pyasic/miners/btc/whatsminer/btminer/M5X/M59.py similarity index 88% rename from pyasic/miners/whatsminer/btminer/M5X/M59.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/M59.py index 89be9c5b..bc9c030c 100644 --- a/pyasic/miners/whatsminer/btminer/M5X/M59.py +++ b/pyasic/miners/btc/whatsminer/btminer/M5X/M59.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import BTMiner # noqa - Ignore access to _module -from pyasic.miners._types import M59VH30 # noqa - Ignore access to _module +from pyasic.miners.btc._backends import BTMiner # noqa - Ignore access to _module +from pyasic.miners.btc._types import M59VH30 # noqa - Ignore access to _module class BTMinerM59VH30(BTMiner, M59VH30): diff --git a/pyasic/miners/whatsminer/btminer/M5X/__init__.py b/pyasic/miners/btc/whatsminer/btminer/M5X/__init__.py similarity index 100% rename from pyasic/miners/whatsminer/btminer/M5X/__init__.py rename to pyasic/miners/btc/whatsminer/btminer/M5X/__init__.py diff --git a/pyasic/miners/whatsminer/btminer/__init__.py b/pyasic/miners/btc/whatsminer/btminer/__init__.py similarity index 100% rename from pyasic/miners/whatsminer/btminer/__init__.py rename to pyasic/miners/btc/whatsminer/btminer/__init__.py diff --git a/pyasic/miners/antminer/cgminer/X15/__init__.py b/pyasic/miners/ltc/__init__.py similarity index 97% rename from pyasic/miners/antminer/cgminer/X15/__init__.py rename to pyasic/miners/ltc/__init__.py index 01ed451c..a2151b40 100644 --- a/pyasic/miners/antminer/cgminer/X15/__init__.py +++ b/pyasic/miners/ltc/__init__.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .Z15 import CGMinerZ15 \ No newline at end of file +from .antminer import * diff --git a/pyasic/miners/_backends/X7.py b/pyasic/miners/ltc/_backends/X7.py similarity index 99% rename from pyasic/miners/_backends/X7.py rename to pyasic/miners/ltc/_backends/X7.py index cc56457d..6abdecba 100644 --- a/pyasic/miners/_backends/X7.py +++ b/pyasic/miners/ltc/_backends/X7.py @@ -19,11 +19,12 @@ from typing import List, Optional, Union from pyasic.API import APIError from pyasic.config import MinerConfig, X19PowerMode -from pyasic.data.error_codes import MinerErrorData, X19Error from pyasic.data import HashBoard -from pyasic.miners._backends import BMMiner # noqa - Ignore access to _module +from pyasic.data.error_codes import MinerErrorData, X19Error +from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module from pyasic.web.X7 import X7WebAPI + class X7(BMMiner): def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: super().__init__(ip, api_ver=api_ver) @@ -51,7 +52,6 @@ class X7(BMMiner): except (IndexError, KeyError, ValueError, TypeError): pass - async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: hashboards = [] diff --git a/pyasic/miners/ltc/_backends/__init__.py b/pyasic/miners/ltc/_backends/__init__.py new file mode 100644 index 00000000..e0a9f765 --- /dev/null +++ b/pyasic/miners/ltc/_backends/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .X7 import X7 diff --git a/pyasic/miners/ltc/_types/__init__.py b/pyasic/miners/ltc/_types/__init__.py new file mode 100644 index 00000000..71d6224e --- /dev/null +++ b/pyasic/miners/ltc/_types/__init__.py @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------------------ +# 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 * diff --git a/pyasic/miners/_types/antminer/X7/L7.py b/pyasic/miners/ltc/_types/antminer/X7/L7.py similarity index 96% rename from pyasic/miners/_types/antminer/X7/L7.py rename to pyasic/miners/ltc/_types/antminer/X7/L7.py index d32e6336..0c7ad0b7 100644 --- a/pyasic/miners/_types/antminer/X7/L7.py +++ b/pyasic/miners/ltc/_types/antminer/X7/L7.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class L7(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/ltc/_types/antminer/X7/__init__.py b/pyasic/miners/ltc/_types/antminer/X7/__init__.py new file mode 100644 index 00000000..f612fc71 --- /dev/null +++ b/pyasic/miners/ltc/_types/antminer/X7/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .L7 import L7 diff --git a/pyasic/miners/_types/antminer/X7/__init__.py b/pyasic/miners/ltc/_types/antminer/__init__.py similarity index 98% rename from pyasic/miners/_types/antminer/X7/__init__.py rename to pyasic/miners/ltc/_types/antminer/__init__.py index f80d44bc..ed14989c 100644 --- a/pyasic/miners/_types/antminer/X7/__init__.py +++ b/pyasic/miners/ltc/_types/antminer/__init__.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .L7 import L7 \ No newline at end of file +from .X7 import * diff --git a/pyasic/miners/ltc/antminer/__init__.py b/pyasic/miners/ltc/antminer/__init__.py new file mode 100644 index 00000000..0118dff1 --- /dev/null +++ b/pyasic/miners/ltc/antminer/__init__.py @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------------------ +# 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 .bmminer import * diff --git a/pyasic/miners/antminer/bmminer/X7/L7.py b/pyasic/miners/ltc/antminer/bmminer/X7/L7.py similarity index 89% rename from pyasic/miners/antminer/bmminer/X7/L7.py rename to pyasic/miners/ltc/antminer/bmminer/X7/L7.py index 61d0af36..e33d31a2 100644 --- a/pyasic/miners/antminer/bmminer/X7/L7.py +++ b/pyasic/miners/ltc/antminer/bmminer/X7/L7.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X7 # noqa - Ignore access to _module -from pyasic.miners._types import L7 # noqa - Ignore access to _module +from pyasic.miners.ltc._backends import X7 # noqa - Ignore access to _module +from pyasic.miners.ltc._types import L7 # noqa - Ignore access to _module # noqa - Ignore access to _module diff --git a/pyasic/miners/antminer/bmminer/X7/__init__.py b/pyasic/miners/ltc/antminer/bmminer/X7/__init__.py similarity index 100% rename from pyasic/miners/antminer/bmminer/X7/__init__.py rename to pyasic/miners/ltc/antminer/bmminer/X7/__init__.py diff --git a/pyasic/miners/_types/antminer/X15/__init__.py b/pyasic/miners/ltc/antminer/bmminer/__init__.py similarity index 98% rename from pyasic/miners/_types/antminer/X15/__init__.py rename to pyasic/miners/ltc/antminer/bmminer/__init__.py index 2fdccb75..ed14989c 100644 --- a/pyasic/miners/_types/antminer/X15/__init__.py +++ b/pyasic/miners/ltc/antminer/bmminer/__init__.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .Z15 import * \ No newline at end of file +from .X7 import * diff --git a/pyasic/miners/_types/makes.py b/pyasic/miners/makes.py similarity index 100% rename from pyasic/miners/_types/makes.py rename to pyasic/miners/makes.py diff --git a/pyasic/miners/miner_factory.py b/pyasic/miners/miner_factory.py index 0d94f4dd..a8c8d310 100644 --- a/pyasic/miners/miner_factory.py +++ b/pyasic/miners/miner_factory.py @@ -25,19 +25,18 @@ import asyncssh import httpx from pyasic.errors import APIError -from pyasic.miners._backends.bmminer import BMMiner # noqa - Ignore _module import -from pyasic.miners._backends.bosminer import BOSMiner # noqa - Ignore _module import -from pyasic.miners._backends.bosminer_old import ( # noqa - Ignore _module import +from pyasic.miners.base import AnyMiner +from pyasic.miners.btc import * +from pyasic.miners.btc._backends import BOSMiner # noqa - Ignore _module import +from pyasic.miners.btc._backends import CGMiner # noqa - Ignore _module import +from pyasic.miners.btc._backends.bmminer import BMMiner # noqa - Ignore _module import +from pyasic.miners.btc._backends.bosminer_old import ( # noqa - Ignore _module import BOSMinerOld, ) -from pyasic.miners._backends.btminer import BTMiner # noqa - Ignore _module import -from pyasic.miners._backends.cgminer import CGMiner # noqa - Ignore _module import -from pyasic.miners.antminer import * -from pyasic.miners.avalonminer import * -from pyasic.miners.base import AnyMiner -from pyasic.miners.innosilicon import * +from pyasic.miners.btc._backends.btminer import BTMiner # noqa - Ignore _module import +from pyasic.miners.ltc import * from pyasic.miners.unknown import UnknownMiner -from pyasic.miners.whatsminer import * +from pyasic.miners.zec import * from pyasic.misc import Singleton from pyasic.settings import PyasicSettings diff --git a/pyasic/miners/zec/__init__.py b/pyasic/miners/zec/__init__.py new file mode 100644 index 00000000..a2151b40 --- /dev/null +++ b/pyasic/miners/zec/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 * diff --git a/pyasic/miners/_backends/X15.py b/pyasic/miners/zec/_backends/X15.py similarity index 80% rename from pyasic/miners/_backends/X15.py rename to pyasic/miners/zec/_backends/X15.py index 55cc427a..3a9fa180 100644 --- a/pyasic/miners/_backends/X15.py +++ b/pyasic/miners/zec/_backends/X15.py @@ -14,14 +14,13 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from typing import Union +from typing import List, Optional, Union -from pyasic.miners._backends import CGMiner # noqa - Ignore access to _module -from pyasic.web.X15 import X15WebAPI -from typing import List +from pyasic.config import MinerConfig from pyasic.data import Fan, HashBoard from pyasic.errors import APIError -from pyasic.config import MinerConfig, X19PowerMode +from pyasic.miners.zec._backends import CGMiner # noqa - Ignore access to _module +from pyasic.web.X15 import X15WebAPI class X15(CGMiner): @@ -76,24 +75,52 @@ class X15(CGMiner): return True return False - async def get_fault_light(self) -> bool: + async def get_fault_light(self, web_get_blink_status: dict = None) -> bool: if self.light: return self.light - try: - data = await self.web.get_blink_status() - if data: - self.light = data["isBlinking"] - except KeyError: - pass + + if not web_get_blink_status: + try: + web_get_blink_status = await self.web.get_blink_status() + except APIError: + pass + + if web_get_blink_status: + try: + self.light = web_get_blink_status["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 + async def get_hostname(self, web_get_system_info: dict = None) -> Optional[str]: + if not web_get_system_info: + try: + web_get_system_info = await self.web.get_system_info() + except APIError: + pass + + if web_get_system_info: + try: + return web_get_system_info["hostname"] + except KeyError: + pass + + async def get_model(self, web_get_system_info: dict = None) -> Optional[str]: + if self.model: + return self.model + + if not web_get_system_info: + try: + web_get_system_info = await self.web.get_system_info() + except APIError: + pass + + if web_get_system_info: + try: + return web_get_system_info["minertype"] + except APIError: + pass + async def get_fans(self, api_stats: dict = None) -> List[Fan]: if not api_stats: try: @@ -173,4 +200,3 @@ class X15(CGMiner): pass return hashboards - diff --git a/pyasic/miners/zec/_backends/__init__.py b/pyasic/miners/zec/_backends/__init__.py new file mode 100644 index 00000000..5606c95f --- /dev/null +++ b/pyasic/miners/zec/_backends/__init__.py @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------------------ +# 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 .cgminer import CGMiner +from .X15 import X15 diff --git a/pyasic/miners/zec/_backends/cgminer.py b/pyasic/miners/zec/_backends/cgminer.py new file mode 100644 index 00000000..7fd898b2 --- /dev/null +++ b/pyasic/miners/zec/_backends/cgminer.py @@ -0,0 +1,397 @@ +# ------------------------------------------------------------------------------ +# 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. - +# ------------------------------------------------------------------------------ + +import ipaddress +import logging +from collections import namedtuple +from typing import List, Optional, Tuple + +import asyncssh + +from pyasic.API.cgminer import CGMinerAPI +from pyasic.config import MinerConfig +from pyasic.data import Fan, HashBoard +from pyasic.data.error_codes import MinerErrorData +from pyasic.errors import APIError +from pyasic.miners.base import BaseMiner + + +class CGMiner(BaseMiner): + def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: + super().__init__(ip) + self.ip = ipaddress.ip_address(ip) + self.api = CGMinerAPI(ip, api_ver) + self.api_ver = api_ver + self.api_type = "CGMiner" + self.uname = "root" + self.pwd = "admin" + self.config = None + + async def send_ssh_command(self, cmd: str) -> Optional[str]: + result = None + + try: + conn = await self._get_ssh_connection() + except (asyncssh.Error, OSError): + return None + + # open an ssh connection + async with conn: + # 3 retries + for i in range(3): + try: + # run the command and get the result + result = await conn.run(cmd) + result = result.stdout + + except Exception as e: + # if the command fails, log it + logging.warning(f"{self} command {cmd} error: {e}") + + # on the 3rd retry, return None + if i == 3: + return + continue + # return the result, either command output or None + return result + + async def restart_backend(self) -> bool: + """Restart cgminer hashing process. Wraps [`restart_cgminer`][pyasic.miners._backends.cgminer.CGMiner.restart_cgminer] to standardize.""" + return await self.restart_cgminer() + + async def restart_cgminer(self) -> bool: + """Restart cgminer hashing process.""" + commands = ["cgminer-api restart", "/usr/bin/cgminer-monitor >/dev/null 2>&1"] + commands = ";".join(commands) + try: + _ret = await self.send_ssh_command(commands) + except (asyncssh.Error, OSError): + return False + else: + if isinstance(_ret, str): + return True + return False + + async def reboot(self) -> bool: + """Reboots power to the physical miner.""" + logging.debug(f"{self}: Sending reboot command.") + try: + _ret = await self.send_ssh_command("reboot") + except (asyncssh.Error, OSError): + return False + else: + logging.debug(f"{self}: Reboot command completed.") + if isinstance(_ret, str): + return True + return False + + async def resume_mining(self) -> bool: + try: + commands = [ + "mkdir -p /etc/tmp/", + 'echo "*/3 * * * * /usr/bin/cgminer-monitor" > /etc/tmp/root', + "crontab -u root /etc/tmp/root", + "/usr/bin/cgminer-monitor >/dev/null 2>&1", + ] + commands = ";".join(commands) + await self.send_ssh_command(commands) + except (asyncssh.Error, OSError): + return False + else: + return True + + async def stop_mining(self) -> bool: + try: + commands = [ + "mkdir -p /etc/tmp/", + 'echo "" > /etc/tmp/root', + "crontab -u root /etc/tmp/root", + "killall cgminer", + ] + commands = ";".join(commands) + await self.send_ssh_command(commands) + except (asyncssh.Error, OSError): + return False + else: + return True + + async def get_config(self) -> MinerConfig: + api_pools = await self.api.pools() + + if api_pools: + self.config = MinerConfig().from_api(api_pools["POOLS"]) + return self.config + + async def fault_light_off(self) -> bool: + return False + + async def fault_light_on(self) -> bool: + return False + + async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None: + return None + + async def set_power_limit(self, wattage: int) -> bool: + return False + + ################################################## + ### DATA GATHERING FUNCTIONS (get_{some_data}) ### + ################################################## + + async def get_mac(self) -> Optional[str]: + return None + + async def get_model(self, api_devdetails: dict = None) -> Optional[str]: + if self.model: + logging.debug(f"Found model for {self.ip}: {self.model}") + return self.model + + if not api_devdetails: + try: + api_devdetails = await self.api.devdetails() + except APIError: + pass + + if api_devdetails: + try: + self.model = api_devdetails["DEVDETAILS"][0]["Model"].replace( + "Antminer ", "" + ) + logging.debug(f"Found model for {self.ip}: {self.model}") + return self.model + except (TypeError, IndexError, KeyError): + pass + + logging.warning(f"Failed to get model for miner: {self}") + return None + + async def get_version( + self, api_version: dict = None + ) -> Tuple[Optional[str], Optional[str]]: + miner_version = namedtuple("MinerVersion", "api_ver fw_ver") + return miner_version( + api_ver=await self.get_api_ver(api_version=api_version), + fw_ver=await self.get_fw_ver(api_version=api_version), + ) + + async def get_api_ver(self, api_version: dict = None) -> Optional[str]: + if self.api_ver: + return self.api_ver + + if not api_version: + try: + api_version = await self.api.version() + except APIError: + pass + + if api_version: + try: + self.api_ver = api_version["VERSION"][0]["API"] + except (KeyError, IndexError): + pass + + return self.api_ver + + async def get_fw_ver(self, api_version: dict = None) -> Optional[str]: + if self.fw_ver: + return self.fw_ver + + if not api_version: + try: + api_version = await self.api.version() + except APIError: + pass + + if api_version: + try: + self.fw_ver = api_version["VERSION"][0]["CGMiner"] + except (KeyError, IndexError): + pass + + return self.fw_ver + + async def get_hostname(self) -> Optional[str]: + try: + hn = await self.send_ssh_command("cat /proc/sys/kernel/hostname") + except (asyncssh.Error, OSError): + return None + if hn: + self.hostname = hn + return self.hostname + + async def get_hashrate(self, api_summary: dict = None) -> Optional[float]: + # get hr from API + if not api_summary: + try: + api_summary = await self.api.summary() + except APIError: + pass + + if api_summary: + try: + return round( + float(float(api_summary["SUMMARY"][0]["GHS 5s"]) / 1000), 2 + ) + except (IndexError, KeyError, ValueError, TypeError): + pass + + async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: + hashboards = [] + + if not api_stats: + try: + api_stats = await self.api.stats() + except APIError: + pass + + if api_stats: + try: + board_offset = -1 + boards = api_stats["STATS"] + if len(boards) > 1: + for board_num in range(1, 16, 5): + for _b_num in range(5): + b = boards[1].get(f"chain_acn{board_num + _b_num}") + + if b and not b == 0 and board_offset == -1: + board_offset = board_num + if board_offset == -1: + board_offset = 1 + + for i in range(board_offset, board_offset + self.ideal_hashboards): + hashboard = HashBoard( + slot=i - board_offset, expected_chips=self.nominal_chips + ) + + chip_temp = boards[1].get(f"temp{i}") + if chip_temp: + hashboard.chip_temp = round(chip_temp) + + temp = boards[1].get(f"temp2_{i}") + if temp: + hashboard.temp = round(temp) + + hashrate = boards[1].get(f"chain_rate{i}") + if hashrate: + hashboard.hashrate = round(float(hashrate) / 1000, 2) + + chips = boards[1].get(f"chain_acn{i}") + if chips: + hashboard.chips = chips + hashboard.missing = False + if (not chips) or (not chips > 0): + hashboard.missing = True + hashboards.append(hashboard) + except (IndexError, KeyError, ValueError, TypeError): + pass + + return hashboards + + async def get_env_temp(self) -> Optional[float]: + return None + + async def get_wattage(self) -> Optional[int]: + return None + + async def get_wattage_limit(self) -> Optional[int]: + return None + + async def get_fans(self, api_stats: dict = None) -> List[Fan]: + if not api_stats: + try: + api_stats = await self.api.stats() + except APIError: + pass + + fans_data = [Fan(), Fan(), Fan(), Fan()] + if api_stats: + try: + fan_offset = -1 + + for fan_num in range(1, 8, 4): + for _f_num in range(4): + f = api_stats["STATS"][1].get(f"fan{fan_num + _f_num}") + if f and not f == 0 and fan_offset == -1: + fan_offset = fan_num + if fan_offset == -1: + fan_offset = 1 + + for fan in range(self.fan_count): + fans_data[fan] = Fan( + api_stats["STATS"][1].get(f"fan{fan_offset+fan}") + ) + except (KeyError, IndexError): + pass + return fans_data + + async def get_fan_psu(self) -> Optional[int]: + return None + + async def get_pools(self, api_pools: dict = None) -> List[dict]: + groups = [] + + if not api_pools: + try: + api_pools = await self.api.pools() + except APIError: + pass + + if api_pools: + try: + pools = {} + for i, pool in enumerate(api_pools["POOLS"]): + pools[f"pool_{i + 1}_url"] = ( + pool["URL"] + .replace("stratum+tcp://", "") + .replace("stratum2+tcp://", "") + ) + pools[f"pool_{i + 1}_user"] = pool["User"] + pools["quota"] = pool["Quota"] if pool.get("Quota") else "0" + + groups.append(pools) + except KeyError: + pass + return groups + + async def get_errors(self) -> List[MinerErrorData]: + return [] + + async def get_fault_light(self) -> bool: + return False + + async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: + # X19 method, not sure compatibility + if not api_stats: + try: + api_stats = await self.api.stats() + except APIError: + pass + + if api_stats: + try: + ideal_rate = api_stats["STATS"][1]["total_rateideal"] + try: + rate_unit = api_stats["STATS"][1]["rate_unit"] + except KeyError: + rate_unit = "GH" + if rate_unit == "GH": + return round(ideal_rate / 1000, 2) + if rate_unit == "MH": + return round(ideal_rate / 1000000, 2) + else: + return round(ideal_rate, 2) + except (KeyError, IndexError): + pass diff --git a/pyasic/miners/zec/_types/__init__.py b/pyasic/miners/zec/_types/__init__.py new file mode 100644 index 00000000..a2151b40 --- /dev/null +++ b/pyasic/miners/zec/_types/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 * diff --git a/pyasic/miners/_types/antminer/X15/Z15.py b/pyasic/miners/zec/_types/antminer/X15/Z15.py similarity index 96% rename from pyasic/miners/_types/antminer/X15/Z15.py rename to pyasic/miners/zec/_types/antminer/X15/Z15.py index 851ecf1c..303841f3 100644 --- a/pyasic/miners/_types/antminer/X15/Z15.py +++ b/pyasic/miners/zec/_types/antminer/X15/Z15.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._types.makes import AntMiner +from pyasic.miners.makes import AntMiner class Z15(AntMiner): # noqa - ignore ABC method implementation diff --git a/pyasic/miners/zec/_types/antminer/X15/__init__.py b/pyasic/miners/zec/_types/antminer/X15/__init__.py new file mode 100644 index 00000000..dbce4b44 --- /dev/null +++ b/pyasic/miners/zec/_types/antminer/X15/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .Z15 import Z15 diff --git a/pyasic/miners/zec/_types/antminer/__init__.py b/pyasic/miners/zec/_types/antminer/__init__.py new file mode 100644 index 00000000..87dc09f5 --- /dev/null +++ b/pyasic/miners/zec/_types/antminer/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .X15 import * diff --git a/pyasic/miners/zec/antminer/__init__.py b/pyasic/miners/zec/antminer/__init__.py new file mode 100644 index 00000000..10eb58cb --- /dev/null +++ b/pyasic/miners/zec/antminer/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .cgminer import * diff --git a/pyasic/miners/antminer/cgminer/X15/Z15.py b/pyasic/miners/zec/antminer/cgminer/X15/Z15.py similarity index 89% rename from pyasic/miners/antminer/cgminer/X15/Z15.py rename to pyasic/miners/zec/antminer/cgminer/X15/Z15.py index 4b30fc07..339c4276 100644 --- a/pyasic/miners/antminer/cgminer/X15/Z15.py +++ b/pyasic/miners/zec/antminer/cgminer/X15/Z15.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners._backends import X15 # noqa - Ignore access to _module -from pyasic.miners._types import Z15 # noqa - Ignore access to _module +from pyasic.miners.zec._backends import X15 # noqa - Ignore access to _module +from pyasic.miners.zec._types import Z15 # noqa - Ignore access to _module class CGMinerZ15(X15, Z15): diff --git a/pyasic/miners/zec/antminer/cgminer/X15/__init__.py b/pyasic/miners/zec/antminer/cgminer/X15/__init__.py new file mode 100644 index 00000000..a9ec958d --- /dev/null +++ b/pyasic/miners/zec/antminer/cgminer/X15/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .Z15 import CGMinerZ15 diff --git a/pyasic/miners/zec/antminer/cgminer/__init__.py b/pyasic/miners/zec/antminer/cgminer/__init__.py new file mode 100644 index 00000000..87dc09f5 --- /dev/null +++ b/pyasic/miners/zec/antminer/cgminer/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# 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 .X15 import * diff --git a/tests/miners_tests/__init__.py b/tests/miners_tests/__init__.py index 0b1b3183..f248c1b9 100644 --- a/tests/miners_tests/__init__.py +++ b/tests/miners_tests/__init__.py @@ -19,8 +19,8 @@ import sys import unittest import warnings -from pyasic.miners._backends import CGMiner # noqa from pyasic.miners.base import BaseMiner +from pyasic.miners.btc._backends import CGMiner # noqa from pyasic.miners.miner_factory import MINER_CLASSES, MinerFactory @@ -42,9 +42,15 @@ class MinersTest(unittest.TestCase): def test_miner_backend_backup_creation(self): warnings.filterwarnings("ignore") - backends = inspect.getmembers( - sys.modules["pyasic.miners._backends"], inspect.isclass - ) + backends = [ + list( + inspect.getmembers( + sys.modules[f"pyasic.miners.{algo}._backends"], inspect.isclass + ) + ) + for algo in ["btc", "zec", "ltc"] + ] + backends = [item for sublist in backends for item in sublist] for backend in backends: miner_class = backend[1] with self.subTest(miner_class=miner_class): @@ -54,9 +60,15 @@ class MinersTest(unittest.TestCase): def test_miner_type_creation_failure(self): warnings.filterwarnings("ignore") - backends = inspect.getmembers( - sys.modules["pyasic.miners._types"], inspect.isclass - ) + backends = [ + list( + inspect.getmembers( + sys.modules[f"pyasic.miners.{algo}._types"], inspect.isclass + ) + ) + for algo in ["btc", "zec", "ltc"] + ] + backends = [item for sublist in backends for item in sublist] for backend in backends: miner_class = backend[1] with self.subTest(miner_class=miner_class):