From e4461769227463f151204d3760a9e9754ca2ed24 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Mon, 12 Jun 2023 11:02:51 -0600 Subject: [PATCH] refactor: refactor miner types. --- pyasic/load/__init__.py | 17 +-- pyasic/miners/{btc => }/antminer/__init__.py | 0 .../S19j.py => antminer/bmminer/X17/S17.py} | 18 ++- .../bmminer/X17/T17.py} | 15 ++- .../miners/antminer/bmminer/X17/__init__.py | 18 +++ .../bmminer/X19/S19.py} | 49 +++++++- .../{btc => }/antminer/bmminer/X19/T19.py | 2 +- .../X17 => antminer/bmminer/X19}/__init__.py | 20 ++-- .../{hns => }/antminer/bmminer/X3/HS3.py | 2 +- .../A12X.py => antminer/bmminer/X3/L3.py} | 5 +- .../{hns => }/antminer/bmminer/X3/__init__.py | 1 + .../{ltc => }/antminer/bmminer/X7/L7.py | 2 +- .../{ltc => }/antminer/bmminer/X7/__init__.py | 0 .../E9_Pro.py => antminer/bmminer/X9/E9.py} | 2 +- .../X9/S9i.py => antminer/bmminer/X9/S9.py} | 10 +- .../{btc => }/antminer/bmminer/X9/T9.py | 2 +- .../{btc => }/antminer/bmminer/X9/__init__.py | 5 +- .../{btc => }/antminer/bmminer/__init__.py | 2 + .../bosminer/X17/S17.py} | 14 ++- .../bosminer/X17/T17.py} | 10 +- .../miners/antminer/bosminer/X17/__init__.py | 18 +++ .../S19j.py => antminer/bosminer/X19/S19.py} | 14 ++- .../{btc => }/antminer/bosminer/X19/T19.py | 2 +- .../miners/antminer/bosminer/X19/__init__.py | 24 ++++ .../{btc => }/antminer/bosminer/X9/S9.py | 2 +- .../antminer/bosminer/X9/__init__.py | 0 .../{btc => }/antminer/bosminer/__init__.py | 0 .../{zec => }/antminer/cgminer/X15/Z15.py | 2 +- .../antminer/cgminer/X15/__init__.py | 0 .../{dsh => }/antminer/cgminer/X3/D3.py | 3 +- .../{dsh => }/antminer/cgminer/X3/__init__.py | 1 + .../{dcr => }/antminer/cgminer/X5/DR5.py | 2 +- .../{dcr => }/antminer/cgminer/X5/__init__.py | 0 .../antminer => antminer/cgminer}/__init__.py | 3 + .../miners/{btc => }/antminer/hiveon/X9/T9.py | 4 +- .../{btc => }/antminer/hiveon/X9/__init__.py | 0 .../{btc => }/antminer/hiveon/__init__.py | 0 .../S19j_Pro.py => antminer/vnish/X19/S19.py} | 28 ++++- .../A7X/A7X.py => antminer/vnish/X19/T19.py} | 5 +- pyasic/miners/antminer/vnish/X19/__init__.py | 26 +++++ .../X3/L3_Plus.py => antminer/vnish/X3/L3.py} | 2 +- .../cgminer => antminer/vnish/X3}/__init__.py | 2 +- .../{btc => }/antminer/vnish/__init__.py | 1 + .../miners/{btc => }/avalonminer/__init__.py | 0 .../avalonminer/cgminer/A10X/A1026.py | 7 +- .../avalonminer/cgminer/A10X/A1047.py | 7 +- .../avalonminer/cgminer/A10X/A1066.py | 7 +- .../avalonminer/cgminer/A10X/__init__.py | 0 .../avalonminer/cgminer/A11X/A1166.py | 7 +- .../avalonminer/cgminer/A11X/__init__.py | 0 .../avalonminer/cgminer/A12X/A1246.py | 7 +- .../avalonminer/cgminer/A12X/__init__.py | 0 .../{btc => }/avalonminer/cgminer/A7X/A721.py | 7 +- .../{btc => }/avalonminer/cgminer/A7X/A741.py | 7 +- .../{btc => }/avalonminer/cgminer/A7X/A761.py | 7 +- .../avalonminer/cgminer/A7X/__init__.py | 0 .../{btc => }/avalonminer/cgminer/A8X/A821.py | 7 +- .../{btc => }/avalonminer/cgminer/A8X/A841.py | 7 +- .../{btc => }/avalonminer/cgminer/A8X/A851.py | 7 +- .../avalonminer/cgminer/A8X/__init__.py | 0 .../{btc => }/avalonminer/cgminer/A9X/A921.py | 4 +- .../avalonminer/cgminer/A9X/__init__.py | 0 .../cgminer}/__init__.py | 0 pyasic/miners/btc/__init__.py | 19 ---- pyasic/miners/btc/_types/antminer/X17/S17.py | 26 ----- .../btc/_types/antminer/X17/S17_Plus.py | 25 ---- pyasic/miners/btc/_types/antminer/X17/S17e.py | 26 ----- pyasic/miners/btc/_types/antminer/X17/T17.py | 26 ----- .../btc/_types/antminer/X17/T17_Plus.py | 26 ----- pyasic/miners/btc/_types/antminer/X17/T17e.py | 26 ----- pyasic/miners/btc/_types/antminer/X19/S19.py | 26 ----- pyasic/miners/btc/_types/antminer/X19/S19L.py | 26 ----- .../miners/btc/_types/antminer/X19/S19_Pro.py | 26 ----- .../btc/_types/antminer/X19/S19_Pro_Plus.py | 26 ----- .../miners/btc/_types/antminer/X19/S19_XP.py | 26 ----- pyasic/miners/btc/_types/antminer/X19/S19a.py | 26 ----- .../btc/_types/antminer/X19/S19a_Pro.py | 26 ----- .../btc/_types/antminer/X19/S19j_Pro.py | 26 ----- .../btc/_types/antminer/X19/__init__.py | 26 ----- pyasic/miners/btc/_types/antminer/X9/S9.py | 26 ----- pyasic/miners/btc/_types/antminer/X9/S9j.py | 26 ----- pyasic/miners/btc/_types/antminer/__init__.py | 18 --- pyasic/miners/btc/antminer/bmminer/X17/S17.py | 23 ---- .../btc/antminer/bmminer/X17/S17_Plus.py | 23 ---- .../btc/antminer/bmminer/X17/S17_Pro.py | 23 ---- .../miners/btc/antminer/bmminer/X17/S17e.py | 23 ---- pyasic/miners/btc/antminer/bmminer/X17/T17.py | 23 ---- .../btc/antminer/bmminer/X17/T17_Plus.py | 23 ---- .../miners/btc/antminer/bmminer/X17/T17e.py | 23 ---- pyasic/miners/btc/antminer/bmminer/X17/X17.py | 83 -------------- .../btc/antminer/bmminer/X17/__init__.py | 23 ---- pyasic/miners/btc/antminer/bmminer/X19/S19.py | 24 ---- .../miners/btc/antminer/bmminer/X19/S19L.py | 22 ---- .../btc/antminer/bmminer/X19/S19_Pro.py | 24 ---- .../miners/btc/antminer/bmminer/X19/S19_XP.py | 24 ---- .../miners/btc/antminer/bmminer/X19/S19a.py | 24 ---- .../btc/antminer/bmminer/X19/S19a_Pro.py | 24 ---- .../btc/antminer/bmminer/X19/S19j_Pro.py | 24 ---- .../btc/antminer/bmminer/X19/__init__.py | 26 ----- pyasic/miners/btc/antminer/bmminer/X9/S9.py | 43 ------- pyasic/miners/btc/antminer/bmminer/X9/S9j.py | 22 ---- .../miners/btc/antminer/bosminer/X17/S17.py | 22 ---- .../btc/antminer/bosminer/X17/S17_Pro.py | 22 ---- .../miners/btc/antminer/bosminer/X17/S17e.py | 22 ---- .../miners/btc/antminer/bosminer/X17/T17.py | 22 ---- .../miners/btc/antminer/bosminer/X17/T17e.py | 22 ---- .../btc/antminer/bosminer/X17/__init__.py | 23 ---- .../miners/btc/antminer/bosminer/X19/S19.py | 22 ---- .../btc/antminer/bosminer/X19/S19_Pro.py | 22 ---- .../btc/antminer/bosminer/X19/S19j_Pro.py | 22 ---- .../btc/antminer/bosminer/X19/__init__.py | 21 ---- pyasic/miners/btc/antminer/cgminer/X17/S17.py | 22 ---- .../btc/antminer/cgminer/X17/S17_Plus.py | 22 ---- .../btc/antminer/cgminer/X17/S17_Pro.py | 22 ---- .../miners/btc/antminer/cgminer/X17/S17e.py | 22 ---- pyasic/miners/btc/antminer/cgminer/X17/T17.py | 22 ---- .../btc/antminer/cgminer/X17/T17_Plus.py | 22 ---- .../miners/btc/antminer/cgminer/X17/T17e.py | 22 ---- .../btc/antminer/cgminer/X17/__init__.py | 23 ---- pyasic/miners/btc/antminer/cgminer/X19/S19.py | 22 ---- .../btc/antminer/cgminer/X19/S19_Pro.py | 22 ---- .../miners/btc/antminer/cgminer/X19/S19j.py | 22 ---- .../btc/antminer/cgminer/X19/S19j_Pro.py | 22 ---- pyasic/miners/btc/antminer/cgminer/X19/T19.py | 22 ---- .../btc/antminer/cgminer/X19/__init__.py | 21 ---- pyasic/miners/btc/antminer/cgminer/X9/S9.py | 22 ---- pyasic/miners/btc/antminer/cgminer/X9/T9.py | 25 ---- .../btc/antminer/cgminer/X9/__init__.py | 18 --- pyasic/miners/btc/antminer/vnish/X19/S19.py | 22 ---- .../miners/btc/antminer/vnish/X19/S19_Pro.py | 22 ---- .../miners/btc/antminer/vnish/X19/S19_XP.py | 22 ---- pyasic/miners/btc/antminer/vnish/X19/S19a.py | 22 ---- .../miners/btc/antminer/vnish/X19/S19a_Pro.py | 22 ---- pyasic/miners/btc/antminer/vnish/X19/S19j.py | 22 ---- pyasic/miners/btc/antminer/vnish/X19/T19.py | 22 ---- .../miners/btc/antminer/vnish/X19/__init__.py | 24 ---- .../btc/avalonminer/cgminer/A10X/A10X.py | 21 ---- .../btc/avalonminer/cgminer/A11X/A11X.py | 21 ---- .../miners/btc/avalonminer/cgminer/A8X/A8X.py | 21 ---- .../btc/innosilicon/cgminer/T3X/__init__.py | 17 --- pyasic/miners/ckb/__init__.py | 16 --- pyasic/miners/ckb/_types/__init__.py | 16 --- .../miners/ckb/goldshell/bfgminer/__init__.py | 16 --- pyasic/miners/dcr/__init__.py | 16 --- pyasic/miners/dcr/_types/__init__.py | 16 --- pyasic/miners/dcr/antminer/__init__.py | 16 --- pyasic/miners/dsh/__init__.py | 16 --- pyasic/miners/dsh/_types/__init__.py | 16 --- .../miners/dsh/_types/antminer/X3/__init__.py | 16 --- pyasic/miners/dsh/_types/antminer/__init__.py | 16 --- pyasic/miners/dsh/antminer/__init__.py | 16 --- .../miners/dsh/antminer/cgminer/__init__.py | 16 --- pyasic/miners/etc/__init__.py | 17 --- pyasic/miners/etc/_types/__init__.py | 17 --- .../miners/etc/_types/antminer/X9/__init__.py | 16 --- pyasic/miners/etc/_types/antminer/__init__.py | 16 --- pyasic/miners/etc/antminer/__init__.py | 16 --- .../etc/antminer/bmminer/X9/__init__.py | 16 --- .../miners/etc/antminer/bmminer/__init__.py | 16 --- pyasic/miners/etc/innosilicon/__init__.py | 17 --- pyasic/miners/{ckb => }/goldshell/__init__.py | 0 .../CKX => goldshell/bfgminer/X5}/CK5.py | 2 +- .../HSX => goldshell/bfgminer/X5}/HS5.py | 2 +- .../KDX => goldshell/bfgminer/X5}/KD5.py | 2 +- .../CKX => goldshell/bfgminer/X5}/__init__.py | 2 + .../KDX => goldshell/bfgminer/XMax}/KDMax.py | 4 +- .../bfgminer/XMax}/__init__.py | 1 - .../bfgminer}/__init__.py | 1 + pyasic/miners/hns/__init__.py | 17 --- pyasic/miners/hns/_types/__init__.py | 17 --- pyasic/miners/hns/_types/antminer/__init__.py | 16 --- .../miners/hns/_types/goldshell/__init__.py | 16 --- pyasic/miners/hns/antminer/__init__.py | 16 --- .../miners/hns/antminer/bmminer/__init__.py | 16 --- pyasic/miners/hns/goldshell/__init__.py | 16 --- .../hns/goldshell/bfgminer/HSX/__init__.py | 16 --- .../miners/hns/goldshell/bfgminer/__init__.py | 16 --- .../miners/{btc => }/innosilicon/__init__.py | 0 .../innosilicon/cgminer/A10X/A10X.py | 2 +- .../innosilicon/cgminer/A10X/__init__.py | 0 .../cgminer/T3X/T3H.py} | 6 +- .../innosilicon/cgminer/T3X/__init__.py | 17 +++ .../{etc => }/innosilicon/cgminer/__init__.py | 1 + pyasic/miners/kda/__init__.py | 16 --- pyasic/miners/kda/_types/__init__.py | 16 --- pyasic/miners/kda/goldshell/__init__.py | 16 --- .../miners/kda/goldshell/bfgminer/__init__.py | 16 --- pyasic/miners/ltc/__init__.py | 16 --- pyasic/miners/ltc/_types/__init__.py | 17 --- .../miners/ltc/_types/antminer/X3/__init__.py | 16 --- pyasic/miners/ltc/_types/antminer/__init__.py | 17 --- pyasic/miners/ltc/antminer/__init__.py | 17 --- .../ltc/antminer/bmminer/X3/__init__.py | 17 --- .../miners/ltc/antminer/bmminer/__init__.py | 17 --- .../miners/ltc/antminer/vnish/X3/__init__.py | 17 --- pyasic/miners/ltc/antminer/vnish/__init__.py | 16 --- pyasic/miners/miner_factory.py | 42 ++++--- .../miners/{btc/_types => types}/__init__.py | 1 + .../{zec/_types => types}/antminer/X15/Z15.py | 0 .../_types => types}/antminer/X15/__init__.py | 0 .../S17_Pro.py => types/antminer/X17/S17.py} | 26 +++++ .../X19/S19j.py => types/antminer/X17/T17.py} | 21 +++- .../T3X => types/antminer/X17}/__init__.py | 3 +- pyasic/miners/types/antminer/X19/S19.py | 107 ++++++++++++++++++ .../{btc/_types => types}/antminer/X19/T19.py | 0 pyasic/miners/types/antminer/X19/__init__.py | 29 +++++ .../{dsh/_types => types}/antminer/X3/D3.py | 0 .../{hns/_types => types}/antminer/X3/HS3.py | 0 .../X3/L3_Plus.py => types/antminer/X3/L3.py} | 0 .../_types => types}/antminer/X3/__init__.py | 2 + .../{dcr/_types => types}/antminer/X5/DR5.py | 0 .../_types => types}/antminer/X5/__init__.py | 0 .../{ltc/_types => types}/antminer/X7/L7.py | 0 .../_types => types}/antminer/X7/__init__.py | 0 .../X9/E9_Pro.py => types/antminer/X9/E9.py} | 0 .../X9/S9i.py => types/antminer/X9/S9.py} | 18 +++ .../{btc/_types => types}/antminer/X9/T9.py | 0 .../_types => types}/antminer/X9/__init__.py | 5 +- .../cgminer => types/antminer}/__init__.py | 5 +- .../avalonminer/A10X/A1026.py | 0 .../avalonminer/A10X/A1047.py | 0 .../avalonminer/A10X/A1066.py | 0 .../avalonminer/A10X/__init__.py | 0 .../avalonminer/A11X/A1166.py | 0 .../avalonminer/A11X/__init__.py | 0 .../avalonminer/A12X/A1246.py | 0 .../avalonminer/A12X/__init__.py | 0 .../_types => types}/avalonminer/A7X/A721.py | 0 .../_types => types}/avalonminer/A7X/A741.py | 0 .../_types => types}/avalonminer/A7X/A761.py | 0 .../avalonminer/A7X/__init__.py | 0 .../_types => types}/avalonminer/A8X/A821.py | 0 .../_types => types}/avalonminer/A8X/A841.py | 0 .../_types => types}/avalonminer/A8X/A851.py | 0 .../avalonminer/A8X/__init__.py | 0 .../_types => types}/avalonminer/A9X/A921.py | 0 .../avalonminer/A9X/__init__.py | 0 .../cgminer => types/avalonminer}/__init__.py | 0 .../goldshell => types/goldshell/X5}/CK5.py | 0 .../goldshell => types/goldshell/X5}/HS5.py | 0 .../goldshell => types/goldshell/X5}/KD5.py | 0 .../goldshell/X5}/__init__.py | 2 + .../goldshell/XMax}/KDMax.py | 0 .../goldshell/XMax}/__init__.py | 1 - .../cgminer => types/goldshell}/__init__.py | 1 + .../_types => types}/innosilicon/A10X/A10X.py | 5 - .../innosilicon/A10X}/__init__.py | 1 - .../innosilicon/T3X/T3H.py} | 2 +- .../innosilicon/T3X}/__init__.py | 2 +- .../_types => types}/innosilicon/__init__.py | 1 + .../_types => types}/whatsminer/M2X/M20.py | 0 .../_types => types}/whatsminer/M2X/M20S.py | 0 .../whatsminer/M2X/M20S_Plus.py | 0 .../_types => types}/whatsminer/M2X/M21.py | 0 .../_types => types}/whatsminer/M2X/M21S.py | 0 .../whatsminer/M2X/M21S_Plus.py | 0 .../_types => types}/whatsminer/M2X/M29.py | 0 .../whatsminer/M2X/__init__.py | 0 .../_types => types}/whatsminer/M3X/M30.py | 0 .../_types => types}/whatsminer/M3X/M30S.py | 0 .../whatsminer/M3X/M30S_Plus.py | 0 .../whatsminer/M3X/M30S_Plus_Plus.py | 0 .../_types => types}/whatsminer/M3X/M31.py | 0 .../_types => types}/whatsminer/M3X/M31H.py | 0 .../_types => types}/whatsminer/M3X/M31S.py | 0 .../_types => types}/whatsminer/M3X/M31SE.py | 0 .../whatsminer/M3X/M31S_Plus.py | 0 .../_types => types}/whatsminer/M3X/M32.py | 0 .../_types => types}/whatsminer/M3X/M32S.py | 0 .../_types => types}/whatsminer/M3X/M33.py | 0 .../_types => types}/whatsminer/M3X/M33S.py | 0 .../whatsminer/M3X/M33S_Plus.py | 0 .../whatsminer/M3X/M33S_Plus_Plus.py | 0 .../whatsminer/M3X/M34S_Plus.py | 0 .../_types => types}/whatsminer/M3X/M36S.py | 0 .../whatsminer/M3X/M36S_Plus.py | 0 .../whatsminer/M3X/M36S_Plus_Plus.py | 0 .../_types => types}/whatsminer/M3X/M39.py | 0 .../whatsminer/M3X/__init__.py | 0 .../_types => types}/whatsminer/M5X/M50.py | 0 .../_types => types}/whatsminer/M5X/M50S.py | 0 .../whatsminer/M5X/M50S_Plus.py | 0 .../whatsminer/M5X/M50S_Plus_Plus.py | 0 .../_types => types}/whatsminer/M5X/M53.py | 0 .../_types => types}/whatsminer/M5X/M53S.py | 0 .../whatsminer/M5X/M53S_Plus.py | 0 .../_types => types}/whatsminer/M5X/M56.py | 0 .../_types => types}/whatsminer/M5X/M56S.py | 0 .../whatsminer/M5X/M56S_Plus.py | 0 .../_types => types}/whatsminer/M5X/M59.py | 0 .../whatsminer/M5X/__init__.py | 2 +- .../_types => types}/whatsminer/__init__.py | 0 .../miners/{btc => }/whatsminer/__init__.py | 0 .../{btc => }/whatsminer/btminer/M2X/M20.py | 2 +- .../{btc => }/whatsminer/btminer/M2X/M20S.py | 6 +- .../whatsminer/btminer/M2X/M20S_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M2X/M21.py | 2 +- .../{btc => }/whatsminer/btminer/M2X/M21S.py | 6 +- .../whatsminer/btminer/M2X/M21S_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M2X/M29.py | 2 +- .../whatsminer/btminer/M2X/__init__.py | 0 .../{btc => }/whatsminer/btminer/M3X/M30.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M30S.py | 2 +- .../whatsminer/btminer/M3X/M30S_Plus.py | 2 +- .../whatsminer/btminer/M3X/M30S_Plus_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M31.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M31H.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M31S.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M31SE.py | 6 +- .../whatsminer/btminer/M3X/M31S_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M32.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M32S.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M33.py | 6 +- .../{btc => }/whatsminer/btminer/M3X/M33S.py | 2 +- .../whatsminer/btminer/M3X/M33S_Plus.py | 5 +- .../whatsminer/btminer/M3X/M33S_Plus_Plus.py | 6 +- .../whatsminer/btminer/M3X/M34S_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M36S.py | 2 +- .../whatsminer/btminer/M3X/M36S_Plus.py | 2 +- .../whatsminer/btminer/M3X/M36S_Plus_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M3X/M39.py | 2 +- .../whatsminer/btminer/M3X/__init__.py | 0 .../{btc => }/whatsminer/btminer/M5X/M50.py | 2 +- .../{btc => }/whatsminer/btminer/M5X/M50S.py | 2 +- .../whatsminer/btminer/M5X/M50S_Plus.py | 6 +- .../whatsminer/btminer/M5X/M50S_Plus_Plus.py | 7 +- .../{btc => }/whatsminer/btminer/M5X/M53.py | 2 +- .../{btc => }/whatsminer/btminer/M5X/M53S.py | 2 +- .../whatsminer/btminer/M5X/M53S_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M5X/M56.py | 2 +- .../{btc => }/whatsminer/btminer/M5X/M56S.py | 2 +- .../whatsminer/btminer/M5X/M56S_Plus.py | 2 +- .../{btc => }/whatsminer/btminer/M5X/M59.py | 2 +- .../whatsminer/btminer/M5X/__init__.py | 6 +- .../{btc => }/whatsminer/btminer/__init__.py | 0 pyasic/miners/zec/__init__.py | 16 --- pyasic/miners/zec/_types/__init__.py | 16 --- pyasic/miners/zec/antminer/__init__.py | 16 --- .../miners/zec/antminer/cgminer/__init__.py | 16 --- pyasic/network/__init__.py | 6 +- pyasic/web/S9.py | 80 ------------- pyasic/web/antminer.py | 4 +- 342 files changed, 628 insertions(+), 2906 deletions(-) rename pyasic/miners/{btc => }/antminer/__init__.py (100%) rename pyasic/miners/{btc/antminer/bmminer/X19/S19j.py => antminer/bmminer/X17/S17.py} (81%) rename pyasic/miners/{ltc/antminer/bmminer/X3/L3_Plus.py => antminer/bmminer/X17/T17.py} (85%) create mode 100644 pyasic/miners/antminer/bmminer/X17/__init__.py rename pyasic/miners/{btc/antminer/bmminer/X19/S19_Pro_Plus.py => antminer/bmminer/X19/S19.py} (67%) rename pyasic/miners/{btc => }/antminer/bmminer/X19/T19.py (94%) rename pyasic/miners/{btc/_types/antminer/X17 => antminer/bmminer/X19}/__init__.py (83%) rename pyasic/miners/{hns => }/antminer/bmminer/X3/HS3.py (94%) rename pyasic/miners/{btc/avalonminer/cgminer/A12X/A12X.py => antminer/bmminer/X3/L3.py} (90%) rename pyasic/miners/{hns => }/antminer/bmminer/X3/__init__.py (97%) rename pyasic/miners/{ltc => }/antminer/bmminer/X7/L7.py (95%) rename pyasic/miners/{ltc => }/antminer/bmminer/X7/__init__.py (100%) rename pyasic/miners/{etc/antminer/bmminer/X9/E9_Pro.py => antminer/bmminer/X9/E9.py} (94%) rename pyasic/miners/{btc/antminer/bmminer/X9/S9i.py => antminer/bmminer/X9/S9.py} (90%) rename pyasic/miners/{btc => }/antminer/bmminer/X9/T9.py (94%) rename pyasic/miners/{btc => }/antminer/bmminer/X9/__init__.py (93%) rename pyasic/miners/{btc => }/antminer/bmminer/__init__.py (97%) rename pyasic/miners/{btc/antminer/bosminer/X17/S17_Plus.py => antminer/bosminer/X17/S17.py} (86%) rename pyasic/miners/{btc/antminer/bosminer/X17/T17_Plus.py => antminer/bosminer/X17/T17.py} (90%) create mode 100644 pyasic/miners/antminer/bosminer/X17/__init__.py rename pyasic/miners/{btc/antminer/bosminer/X19/S19j.py => antminer/bosminer/X19/S19.py} (86%) rename pyasic/miners/{btc => }/antminer/bosminer/X19/T19.py (94%) create mode 100644 pyasic/miners/antminer/bosminer/X19/__init__.py rename pyasic/miners/{btc => }/antminer/bosminer/X9/S9.py (94%) rename pyasic/miners/{btc => }/antminer/bosminer/X9/__init__.py (100%) rename pyasic/miners/{btc => }/antminer/bosminer/__init__.py (100%) rename pyasic/miners/{zec => }/antminer/cgminer/X15/Z15.py (94%) rename pyasic/miners/{zec => }/antminer/cgminer/X15/__init__.py (100%) rename pyasic/miners/{dsh => }/antminer/cgminer/X3/D3.py (94%) rename pyasic/miners/{dsh => }/antminer/cgminer/X3/__init__.py (99%) rename pyasic/miners/{dcr => }/antminer/cgminer/X5/DR5.py (94%) rename pyasic/miners/{dcr => }/antminer/cgminer/X5/__init__.py (100%) rename pyasic/miners/{zec/_types/antminer => antminer/cgminer}/__init__.py (97%) 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/S19j_Pro.py => antminer/vnish/X19/S19.py} (76%) rename pyasic/miners/{btc/avalonminer/cgminer/A7X/A7X.py => antminer/vnish/X19/T19.py} (91%) create mode 100644 pyasic/miners/antminer/vnish/X19/__init__.py rename pyasic/miners/{ltc/antminer/vnish/X3/L3_Plus.py => antminer/vnish/X3/L3.py} (94%) rename pyasic/miners/{btc/innosilicon/cgminer => antminer/vnish/X3}/__init__.py (97%) rename pyasic/miners/{btc => }/antminer/vnish/__init__.py (98%) rename pyasic/miners/{btc => }/avalonminer/__init__.py (100%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A10X/A1026.py (88%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A10X/A1047.py (88%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A10X/A1066.py (88%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A10X/__init__.py (100%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A11X/A1166.py (88%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A11X/__init__.py (100%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A12X/A1246.py (89%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A12X/__init__.py (100%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A7X/A721.py (86%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A7X/A741.py (86%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A7X/A761.py (86%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A7X/__init__.py (100%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A8X/A821.py (86%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A8X/A841.py (86%) rename pyasic/miners/{btc => }/avalonminer/cgminer/A8X/A851.py (86%) 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/_types/avalonminer => avalonminer/cgminer}/__init__.py (100%) delete mode 100644 pyasic/miners/btc/__init__.py delete mode 100644 pyasic/miners/btc/_types/antminer/X17/S17.py delete mode 100644 pyasic/miners/btc/_types/antminer/X17/S17_Plus.py delete mode 100644 pyasic/miners/btc/_types/antminer/X17/S17e.py delete mode 100644 pyasic/miners/btc/_types/antminer/X17/T17.py delete mode 100644 pyasic/miners/btc/_types/antminer/X17/T17_Plus.py delete mode 100644 pyasic/miners/btc/_types/antminer/X17/T17e.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19L.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19_Pro.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19_Pro_Plus.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19_XP.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19a.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py delete mode 100644 pyasic/miners/btc/_types/antminer/X19/__init__.py delete mode 100644 pyasic/miners/btc/_types/antminer/X9/S9.py delete mode 100644 pyasic/miners/btc/_types/antminer/X9/S9j.py delete mode 100644 pyasic/miners/btc/_types/antminer/__init__.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/S17.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/S17e.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/T17.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/T17e.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/X17.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X17/__init__.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19L.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19a.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X19/__init__.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X9/S9.py delete mode 100644 pyasic/miners/btc/antminer/bmminer/X9/S9j.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X17/S17.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X17/S17e.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X17/T17.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X17/T17e.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X17/__init__.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X19/S19.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py delete mode 100644 pyasic/miners/btc/antminer/bosminer/X19/__init__.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/S17.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/S17e.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/T17.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/T17e.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X17/__init__.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X19/S19.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X19/S19j.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X19/T19.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X19/__init__.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X9/S9.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X9/T9.py delete mode 100644 pyasic/miners/btc/antminer/cgminer/X9/__init__.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/S19.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/S19_XP.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/S19a.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/S19j.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/T19.py delete mode 100644 pyasic/miners/btc/antminer/vnish/X19/__init__.py delete mode 100644 pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py delete mode 100644 pyasic/miners/btc/avalonminer/cgminer/A11X/A11X.py delete mode 100644 pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py delete mode 100644 pyasic/miners/btc/innosilicon/cgminer/T3X/__init__.py delete mode 100644 pyasic/miners/ckb/__init__.py delete mode 100644 pyasic/miners/ckb/_types/__init__.py delete mode 100644 pyasic/miners/ckb/goldshell/bfgminer/__init__.py delete mode 100644 pyasic/miners/dcr/__init__.py delete mode 100644 pyasic/miners/dcr/_types/__init__.py delete mode 100644 pyasic/miners/dcr/antminer/__init__.py delete mode 100644 pyasic/miners/dsh/__init__.py delete mode 100644 pyasic/miners/dsh/_types/__init__.py delete mode 100644 pyasic/miners/dsh/_types/antminer/X3/__init__.py delete mode 100644 pyasic/miners/dsh/_types/antminer/__init__.py delete mode 100644 pyasic/miners/dsh/antminer/__init__.py delete mode 100644 pyasic/miners/dsh/antminer/cgminer/__init__.py delete mode 100644 pyasic/miners/etc/__init__.py delete mode 100644 pyasic/miners/etc/_types/__init__.py delete mode 100644 pyasic/miners/etc/_types/antminer/X9/__init__.py delete mode 100644 pyasic/miners/etc/_types/antminer/__init__.py delete mode 100644 pyasic/miners/etc/antminer/__init__.py delete mode 100644 pyasic/miners/etc/antminer/bmminer/X9/__init__.py delete mode 100644 pyasic/miners/etc/antminer/bmminer/__init__.py delete mode 100644 pyasic/miners/etc/innosilicon/__init__.py rename pyasic/miners/{ckb => }/goldshell/__init__.py (100%) rename pyasic/miners/{ckb/goldshell/bfgminer/CKX => goldshell/bfgminer/X5}/CK5.py (94%) rename pyasic/miners/{hns/goldshell/bfgminer/HSX => goldshell/bfgminer/X5}/HS5.py (94%) rename pyasic/miners/{kda/goldshell/bfgminer/KDX => goldshell/bfgminer/X5}/KD5.py (94%) rename pyasic/miners/{ckb/goldshell/bfgminer/CKX => goldshell/bfgminer/X5}/__init__.py (95%) rename pyasic/miners/{kda/goldshell/bfgminer/KDX => goldshell/bfgminer/XMax}/KDMax.py (88%) rename pyasic/miners/{kda/goldshell/bfgminer/KDX => goldshell/bfgminer/XMax}/__init__.py (97%) rename pyasic/miners/{dcr/_types/antminer => goldshell/bfgminer}/__init__.py (98%) delete mode 100644 pyasic/miners/hns/__init__.py delete mode 100644 pyasic/miners/hns/_types/__init__.py delete mode 100644 pyasic/miners/hns/_types/antminer/__init__.py delete mode 100644 pyasic/miners/hns/_types/goldshell/__init__.py delete mode 100644 pyasic/miners/hns/antminer/__init__.py delete mode 100644 pyasic/miners/hns/antminer/bmminer/__init__.py delete mode 100644 pyasic/miners/hns/goldshell/__init__.py delete mode 100644 pyasic/miners/hns/goldshell/bfgminer/HSX/__init__.py delete mode 100644 pyasic/miners/hns/goldshell/bfgminer/__init__.py rename pyasic/miners/{btc => }/innosilicon/__init__.py (100%) rename pyasic/miners/{etc => }/innosilicon/cgminer/A10X/A10X.py (99%) rename pyasic/miners/{etc => }/innosilicon/cgminer/A10X/__init__.py (100%) rename pyasic/miners/{btc/innosilicon/cgminer/T3X/T3H_Plus.py => innosilicon/cgminer/T3X/T3H.py} (98%) create mode 100644 pyasic/miners/innosilicon/cgminer/T3X/__init__.py rename pyasic/miners/{etc => }/innosilicon/cgminer/__init__.py (98%) delete mode 100644 pyasic/miners/kda/__init__.py delete mode 100644 pyasic/miners/kda/_types/__init__.py delete mode 100644 pyasic/miners/kda/goldshell/__init__.py delete mode 100644 pyasic/miners/kda/goldshell/bfgminer/__init__.py delete mode 100644 pyasic/miners/ltc/__init__.py delete mode 100644 pyasic/miners/ltc/_types/__init__.py delete mode 100644 pyasic/miners/ltc/_types/antminer/X3/__init__.py delete mode 100644 pyasic/miners/ltc/_types/antminer/__init__.py delete mode 100644 pyasic/miners/ltc/antminer/__init__.py delete mode 100644 pyasic/miners/ltc/antminer/bmminer/X3/__init__.py delete mode 100644 pyasic/miners/ltc/antminer/bmminer/__init__.py delete mode 100644 pyasic/miners/ltc/antminer/vnish/X3/__init__.py delete mode 100644 pyasic/miners/ltc/antminer/vnish/__init__.py rename pyasic/miners/{btc/_types => types}/__init__.py (98%) rename pyasic/miners/{zec/_types => types}/antminer/X15/Z15.py (100%) rename pyasic/miners/{zec/_types => types}/antminer/X15/__init__.py (100%) rename pyasic/miners/{btc/_types/antminer/X17/S17_Pro.py => types/antminer/X17/S17.py} (65%) rename pyasic/miners/{btc/_types/antminer/X19/S19j.py => types/antminer/X17/T17.py} (74%) rename pyasic/miners/{btc/_types/innosilicon/T3X => types/antminer/X17}/__init__.py (93%) create mode 100644 pyasic/miners/types/antminer/X19/S19.py rename pyasic/miners/{btc/_types => types}/antminer/X19/T19.py (100%) create mode 100644 pyasic/miners/types/antminer/X19/__init__.py rename pyasic/miners/{dsh/_types => types}/antminer/X3/D3.py (100%) rename pyasic/miners/{hns/_types => types}/antminer/X3/HS3.py (100%) rename pyasic/miners/{ltc/_types/antminer/X3/L3_Plus.py => types/antminer/X3/L3.py} (100%) rename pyasic/miners/{hns/_types => types}/antminer/X3/__init__.py (96%) rename pyasic/miners/{dcr/_types => types}/antminer/X5/DR5.py (100%) rename pyasic/miners/{dcr/_types => types}/antminer/X5/__init__.py (100%) rename pyasic/miners/{ltc/_types => types}/antminer/X7/L7.py (100%) rename pyasic/miners/{ltc/_types => types}/antminer/X7/__init__.py (100%) rename pyasic/miners/{etc/_types/antminer/X9/E9_Pro.py => types/antminer/X9/E9.py} (100%) rename pyasic/miners/{btc/_types/antminer/X9/S9i.py => types/antminer/X9/S9.py} (74%) rename pyasic/miners/{btc/_types => types}/antminer/X9/T9.py (100%) rename pyasic/miners/{btc/_types => types}/antminer/X9/__init__.py (95%) rename pyasic/miners/{btc/antminer/cgminer => types/antminer}/__init__.py (94%) rename pyasic/miners/{btc/_types => types}/avalonminer/A10X/A1026.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A10X/A1047.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A10X/A1066.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A10X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A11X/A1166.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A11X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A12X/A1246.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A12X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A7X/A721.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A7X/A741.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A7X/A761.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A7X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A8X/A821.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A8X/A841.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A8X/A851.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A8X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A9X/A921.py (100%) rename pyasic/miners/{btc/_types => types}/avalonminer/A9X/__init__.py (100%) rename pyasic/miners/{btc/avalonminer/cgminer => types/avalonminer}/__init__.py (100%) rename pyasic/miners/{ckb/_types/goldshell => types/goldshell/X5}/CK5.py (100%) rename pyasic/miners/{hns/_types/goldshell => types/goldshell/X5}/HS5.py (100%) rename pyasic/miners/{kda/_types/goldshell => types/goldshell/X5}/KD5.py (100%) rename pyasic/miners/{ckb/_types/goldshell => types/goldshell/X5}/__init__.py (96%) rename pyasic/miners/{kda/_types/goldshell => types/goldshell/XMax}/KDMax.py (100%) rename pyasic/miners/{kda/_types/goldshell => types/goldshell/XMax}/__init__.py (98%) rename pyasic/miners/{dcr/antminer/cgminer => types/goldshell}/__init__.py (98%) rename pyasic/miners/{etc/_types => types}/innosilicon/A10X/A10X.py (92%) rename pyasic/miners/{etc/_types/innosilicon => types/innosilicon/A10X}/__init__.py (99%) rename pyasic/miners/{btc/_types/innosilicon/T3X/T3H_Plus.py => types/innosilicon/T3X/T3H.py} (94%) rename pyasic/miners/{etc/_types/innosilicon/A10X => types/innosilicon/T3X}/__init__.py (97%) rename pyasic/miners/{btc/_types => types}/innosilicon/__init__.py (98%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M20.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M20S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M20S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M21.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M21S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M21S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/M29.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M2X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M30.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M30S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M30S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M30S_Plus_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M31.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M31H.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M31S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M31SE.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M31S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M32.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M32S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M33.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M33S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M33S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M33S_Plus_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M34S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M36S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M36S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M36S_Plus_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/M39.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M3X/__init__.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M50.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M50S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M50S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M50S_Plus_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M53.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M53S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M53S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M56.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M56S.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M56S_Plus.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/M59.py (100%) rename pyasic/miners/{btc/_types => types}/whatsminer/M5X/__init__.py (95%) rename pyasic/miners/{btc/_types => types}/whatsminer/__init__.py (100%) rename pyasic/miners/{btc => }/whatsminer/__init__.py (100%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M20.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M20S.py (92%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M20S_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M21.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M21S.py (92%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M21S_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/M29.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M2X/__init__.py (100%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M30.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M30S.py (97%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M30S_Plus.py (97%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M30S_Plus_Plus.py (97%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M31.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M31H.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M31S.py (96%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M31SE.py (92%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M31S_Plus.py (97%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M32.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M32S.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M33.py (92%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M33S.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M33S_Plus.py (92%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M33S_Plus_Plus.py (91%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M34S_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M36S.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M36S_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M36S_Plus_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/M39.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M3X/__init__.py (100%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M50.py (96%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M50S.py (95%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M50S_Plus.py (91%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M50S_Plus_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M53.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M53S.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M53S_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M56.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M56S.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M56S_Plus.py (93%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/M59.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/M5X/__init__.py (94%) rename pyasic/miners/{btc => }/whatsminer/btminer/__init__.py (100%) delete mode 100644 pyasic/miners/zec/__init__.py delete mode 100644 pyasic/miners/zec/_types/__init__.py delete mode 100644 pyasic/miners/zec/antminer/__init__.py delete mode 100644 pyasic/miners/zec/antminer/cgminer/__init__.py delete mode 100644 pyasic/web/S9.py diff --git a/pyasic/load/__init__.py b/pyasic/load/__init__.py index 86588153..7b1b885f 100644 --- a/pyasic/load/__init__.py +++ b/pyasic/load/__init__.py @@ -19,21 +19,8 @@ from typing import List, Union from pyasic.errors import APIError from pyasic.miners import AnyMiner -from pyasic.miners.backends import ( # noqa - Ignore access to _module - AntminerModern, - BOSMiner, - BTMiner, -) -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - S9, - S17, - T17, - S17e, - S17Plus, - S17Pro, - T17e, - T17Plus, -) +from pyasic.miners.backends import AntminerModern, BOSMiner, BTMiner +from pyasic.miners.types import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus FAN_USAGE = 50 # 50 W per fan diff --git a/pyasic/miners/btc/antminer/__init__.py b/pyasic/miners/antminer/__init__.py similarity index 100% rename from pyasic/miners/btc/antminer/__init__.py rename to pyasic/miners/antminer/__init__.py diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19j.py b/pyasic/miners/antminer/bmminer/X17/S17.py similarity index 81% rename from pyasic/miners/btc/antminer/bmminer/X19/S19j.py rename to pyasic/miners/antminer/bmminer/X17/S17.py index 04f23d11..4e0f48eb 100644 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19j.py +++ b/pyasic/miners/antminer/bmminer/X17/S17.py @@ -14,15 +14,21 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19j, S19jNoPIC # noqa - Ignore access to _module - -# noqa - Ignore access to _module +from pyasic.miners.backends import AntminerOld +from pyasic.miners.types import S17, S17e, S17Plus, S17Pro -class BMMinerS19j(AntminerModern, S19j): +class BMMinerS17(AntminerOld, S17): pass -class BMMinerS19jNoPIC(AntminerModern, S19jNoPIC): +class BMMinerS17Plus(AntminerOld, S17Plus): + pass + + +class BMMinerS17Pro(AntminerOld, S17Pro): + pass + + +class BMMinerS17e(AntminerOld, S17e): pass diff --git a/pyasic/miners/ltc/antminer/bmminer/X3/L3_Plus.py b/pyasic/miners/antminer/bmminer/X17/T17.py similarity index 85% rename from pyasic/miners/ltc/antminer/bmminer/X3/L3_Plus.py rename to pyasic/miners/antminer/bmminer/X17/T17.py index 48760bdb..8552e730 100644 --- a/pyasic/miners/ltc/antminer/bmminer/X3/L3_Plus.py +++ b/pyasic/miners/antminer/bmminer/X17/T17.py @@ -15,9 +15,16 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerOld -from pyasic.miners.ltc._types import L3Plus # noqa - Ignore access to _module +from pyasic.miners.types import T17, T17e, T17Plus -class BMMinerL3Plus(AntminerOld, L3Plus): - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) +class BMMinerT17(AntminerOld, T17): + pass + + +class BMMinerT17Plus(AntminerOld, T17Plus): + pass + + +class BMMinerT17e(AntminerOld, T17e): + pass diff --git a/pyasic/miners/antminer/bmminer/X17/__init__.py b/pyasic/miners/antminer/bmminer/X17/__init__.py new file mode 100644 index 00000000..27d1f021 --- /dev/null +++ b/pyasic/miners/antminer/bmminer/X17/__init__.py @@ -0,0 +1,18 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from .S17 import BMMinerS17, BMMinerS17e, BMMinerS17Plus, BMMinerS17Pro +from .T17 import BMMinerT17, BMMinerT17e, BMMinerT17Plus diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro_Plus.py b/pyasic/miners/antminer/bmminer/X19/S19.py similarity index 67% rename from pyasic/miners/btc/antminer/bmminer/X19/S19_Pro_Plus.py rename to pyasic/miners/antminer/bmminer/X19/S19.py index 1b64710b..e47c5703 100644 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro_Plus.py +++ b/pyasic/miners/antminer/bmminer/X19/S19.py @@ -15,8 +15,55 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19ProPlus # noqa - Ignore access to _module +from pyasic.miners.types import ( + S19, + S19L, + S19XP, + S19a, + S19aPro, + S19j, + S19jNoPIC, + S19jPro, + S19Pro, + S19ProPlus, +) + + +class BMMinerS19(AntminerModern, S19): + pass + + +class BMMinerS19Pro(AntminerModern, S19Pro): + pass class BMMinerS19ProPlus(AntminerModern, S19ProPlus): pass + + +class BMMinerS19XP(AntminerModern, S19XP): + pass + + +class BMMinerS19a(AntminerModern, S19a): + pass + + +class BMMinerS19aPro(AntminerModern, S19aPro): + pass + + +class BMMinerS19j(AntminerModern, S19j): + pass + + +class BMMinerS19jNoPIC(AntminerModern, S19jNoPIC): + pass + + +class BMMinerS19jPro(AntminerModern, S19jPro): + pass + + +class BMMinerS19L(AntminerModern, S19L): + pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/T19.py b/pyasic/miners/antminer/bmminer/X19/T19.py similarity index 94% rename from pyasic/miners/btc/antminer/bmminer/X19/T19.py rename to pyasic/miners/antminer/bmminer/X19/T19.py index c3b550fa..ce99450c 100644 --- a/pyasic/miners/btc/antminer/bmminer/X19/T19.py +++ b/pyasic/miners/antminer/bmminer/X19/T19.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module +from pyasic.miners.types import T19 # noqa - Ignore access to _module diff --git a/pyasic/miners/btc/_types/antminer/X17/__init__.py b/pyasic/miners/antminer/bmminer/X19/__init__.py similarity index 83% rename from pyasic/miners/btc/_types/antminer/X17/__init__.py rename to pyasic/miners/antminer/bmminer/X19/__init__.py index 9b7636bc..7f2a83c9 100644 --- a/pyasic/miners/btc/_types/antminer/X17/__init__.py +++ b/pyasic/miners/antminer/bmminer/X19/__init__.py @@ -14,10 +14,16 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from .S17 import S17 -from .S17_Plus import S17Plus -from .S17_Pro import S17Pro -from .S17e import S17e -from .T17 import T17 -from .T17_Plus import T17Plus -from .T17e import T17e +from .S19 import ( + BMMinerS19, + BMMinerS19a, + BMMinerS19aPro, + BMMinerS19j, + BMMinerS19jNoPIC, + BMMinerS19jPro, + BMMinerS19L, + BMMinerS19Pro, + BMMinerS19ProPlus, + BMMinerS19XP, +) +from .T19 import BMMinerT19 diff --git a/pyasic/miners/hns/antminer/bmminer/X3/HS3.py b/pyasic/miners/antminer/bmminer/X3/HS3.py similarity index 94% rename from pyasic/miners/hns/antminer/bmminer/X3/HS3.py rename to pyasic/miners/antminer/bmminer/X3/HS3.py index 191009ba..f1df5ebc 100644 --- a/pyasic/miners/hns/antminer/bmminer/X3/HS3.py +++ b/pyasic/miners/antminer/bmminer/X3/HS3.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerModern -from pyasic.miners.hns._types import HS3 # noqa - Ignore access to _module +from pyasic.miners.types import HS3 class BMMinerHS3(AntminerModern, HS3): diff --git a/pyasic/miners/btc/avalonminer/cgminer/A12X/A12X.py b/pyasic/miners/antminer/bmminer/X3/L3.py similarity index 90% rename from pyasic/miners/btc/avalonminer/cgminer/A12X/A12X.py rename to pyasic/miners/antminer/bmminer/X3/L3.py index 0748bfee..d2f4eff9 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A12X/A12X.py +++ b/pyasic/miners/antminer/bmminer/X3/L3.py @@ -14,8 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.backends import CGMinerAvalon # noqa - Ignore access to _module +from pyasic.miners.backends import AntminerOld +from pyasic.miners.types import L3Plus -class CGMinerA12X(CGMinerAvalon): +class BMMinerL3Plus(AntminerOld, L3Plus): pass diff --git a/pyasic/miners/hns/antminer/bmminer/X3/__init__.py b/pyasic/miners/antminer/bmminer/X3/__init__.py similarity index 97% rename from pyasic/miners/hns/antminer/bmminer/X3/__init__.py rename to pyasic/miners/antminer/bmminer/X3/__init__.py index d51206a2..8a963b05 100644 --- a/pyasic/miners/hns/antminer/bmminer/X3/__init__.py +++ b/pyasic/miners/antminer/bmminer/X3/__init__.py @@ -14,3 +14,4 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from .HS3 import BMMinerHS3 +from .L3 import BMMinerL3Plus diff --git a/pyasic/miners/ltc/antminer/bmminer/X7/L7.py b/pyasic/miners/antminer/bmminer/X7/L7.py similarity index 95% rename from pyasic/miners/ltc/antminer/bmminer/X7/L7.py rename to pyasic/miners/antminer/bmminer/X7/L7.py index 7b12e25d..d464f0eb 100644 --- a/pyasic/miners/ltc/antminer/bmminer/X7/L7.py +++ b/pyasic/miners/antminer/bmminer/X7/L7.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerModern -from pyasic.miners.ltc._types import L7 # noqa - Ignore access to _module +from pyasic.miners.types import L7 class BMMinerL7(AntminerModern, L7): diff --git a/pyasic/miners/ltc/antminer/bmminer/X7/__init__.py b/pyasic/miners/antminer/bmminer/X7/__init__.py similarity index 100% rename from pyasic/miners/ltc/antminer/bmminer/X7/__init__.py rename to pyasic/miners/antminer/bmminer/X7/__init__.py diff --git a/pyasic/miners/etc/antminer/bmminer/X9/E9_Pro.py b/pyasic/miners/antminer/bmminer/X9/E9.py similarity index 94% rename from pyasic/miners/etc/antminer/bmminer/X9/E9_Pro.py rename to pyasic/miners/antminer/bmminer/X9/E9.py index 0b9776e6..b99d8a04 100644 --- a/pyasic/miners/etc/antminer/bmminer/X9/E9_Pro.py +++ b/pyasic/miners/antminer/bmminer/X9/E9.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerModern -from pyasic.miners.etc._types import E9Pro # noqa - Ignore access to _module +from pyasic.miners.types import E9Pro class BMMinerE9Pro(AntminerModern, E9Pro): diff --git a/pyasic/miners/btc/antminer/bmminer/X9/S9i.py b/pyasic/miners/antminer/bmminer/X9/S9.py similarity index 90% rename from pyasic/miners/btc/antminer/bmminer/X9/S9i.py rename to pyasic/miners/antminer/bmminer/X9/S9.py index 2e7a299a..77e98b77 100644 --- a/pyasic/miners/btc/antminer/bmminer/X9/S9i.py +++ b/pyasic/miners/antminer/bmminer/X9/S9.py @@ -15,8 +15,16 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BMMiner -from pyasic.miners.btc._types import S9i # noqa - Ignore access to _module +from pyasic.miners.types import S9, S9i, S9j + + +class BMMinerS9(BMMiner, S9): + pass class BMMinerS9i(BMMiner, S9i): pass + + +class BMMinerS9j(BMMiner, S9j): + pass diff --git a/pyasic/miners/btc/antminer/bmminer/X9/T9.py b/pyasic/miners/antminer/bmminer/X9/T9.py similarity index 94% rename from pyasic/miners/btc/antminer/bmminer/X9/T9.py rename to pyasic/miners/antminer/bmminer/X9/T9.py index 1ed0063a..0d3729ad 100644 --- a/pyasic/miners/btc/antminer/bmminer/X9/T9.py +++ b/pyasic/miners/antminer/bmminer/X9/T9.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BMMiner -from pyasic.miners.btc._types import T9 # noqa - Ignore access to _module +from pyasic.miners.types import T9 class BMMinerT9(BMMiner, T9): diff --git a/pyasic/miners/btc/antminer/bmminer/X9/__init__.py b/pyasic/miners/antminer/bmminer/X9/__init__.py similarity index 93% rename from pyasic/miners/btc/antminer/bmminer/X9/__init__.py rename to pyasic/miners/antminer/bmminer/X9/__init__.py index d738505b..88480b00 100644 --- a/pyasic/miners/btc/antminer/bmminer/X9/__init__.py +++ b/pyasic/miners/antminer/bmminer/X9/__init__.py @@ -14,7 +14,6 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from .S9 import BMMinerS9 -from .S9i import BMMinerS9i -from .S9j import BMMinerS9j +from .E9 import BMMinerE9Pro +from .S9 import BMMinerS9, BMMinerS9i, BMMinerS9j from .T9 import BMMinerT9 diff --git a/pyasic/miners/btc/antminer/bmminer/__init__.py b/pyasic/miners/antminer/bmminer/__init__.py similarity index 97% rename from pyasic/miners/btc/antminer/bmminer/__init__.py rename to pyasic/miners/antminer/bmminer/__init__.py index d4d4051b..51674d67 100644 --- a/pyasic/miners/btc/antminer/bmminer/__init__.py +++ b/pyasic/miners/antminer/bmminer/__init__.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ +from .X3 import * +from .X7 import * from .X9 import * from .X17 import * from .X19 import * diff --git a/pyasic/miners/btc/antminer/bosminer/X17/S17_Plus.py b/pyasic/miners/antminer/bosminer/X17/S17.py similarity index 86% rename from pyasic/miners/btc/antminer/bosminer/X17/S17_Plus.py rename to pyasic/miners/antminer/bosminer/X17/S17.py index 37c0b51a..42a515f7 100644 --- a/pyasic/miners/btc/antminer/bosminer/X17/S17_Plus.py +++ b/pyasic/miners/antminer/bosminer/X17/S17.py @@ -15,8 +15,20 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S17Plus # noqa - Ignore access to _module +from pyasic.miners.types import S17, S17e, S17Plus, S17Pro + + +class BOSMinerS17(BOSMiner, S17): + pass class BOSMinerS17Plus(BOSMiner, S17Plus): pass + + +class BOSMinerS17Pro(BOSMiner, S17Pro): + pass + + +class BOSMinerS17e(BOSMiner, S17e): + pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/T17_Plus.py b/pyasic/miners/antminer/bosminer/X17/T17.py similarity index 90% rename from pyasic/miners/btc/antminer/bosminer/X17/T17_Plus.py rename to pyasic/miners/antminer/bosminer/X17/T17.py index 26c992ef..a939ad80 100644 --- a/pyasic/miners/btc/antminer/bosminer/X17/T17_Plus.py +++ b/pyasic/miners/antminer/bosminer/X17/T17.py @@ -15,8 +15,16 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import T17Plus # noqa - Ignore access to _module +from pyasic.miners.types import T17, T17e, T17Plus + + +class BOSMinerT17(BOSMiner, T17): + pass class BOSMinerT17Plus(BOSMiner, T17Plus): pass + + +class BOSMinerT17e(BOSMiner, T17e): + pass diff --git a/pyasic/miners/antminer/bosminer/X17/__init__.py b/pyasic/miners/antminer/bosminer/X17/__init__.py new file mode 100644 index 00000000..166dd475 --- /dev/null +++ b/pyasic/miners/antminer/bosminer/X17/__init__.py @@ -0,0 +1,18 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from .S17 import BOSMinerS17, BOSMinerS17e, BOSMinerS17Plus, BOSMinerS17Pro +from .T17 import BOSMinerT17, BOSMinerT17e, BOSMinerT17Plus diff --git a/pyasic/miners/btc/antminer/bosminer/X19/S19j.py b/pyasic/miners/antminer/bosminer/X19/S19.py similarity index 86% rename from pyasic/miners/btc/antminer/bosminer/X19/S19j.py rename to pyasic/miners/antminer/bosminer/X19/S19.py index efff9488..ef90c7ec 100644 --- a/pyasic/miners/btc/antminer/bosminer/X19/S19j.py +++ b/pyasic/miners/antminer/bosminer/X19/S19.py @@ -15,7 +15,15 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S19j, S19jNoPIC # noqa - Ignore access to _module +from pyasic.miners.types import S19, S19j, S19jNoPIC, S19jPro, S19Pro + + +class BOSMinerS19(BOSMiner, S19): + pass + + +class BOSMinerS19Pro(BOSMiner, S19Pro): + pass class BOSMinerS19j(BOSMiner, S19j): @@ -24,3 +32,7 @@ class BOSMinerS19j(BOSMiner, S19j): class BOSMinerS19jNoPIC(BOSMiner, S19jNoPIC): pass + + +class BOSMinerS19jPro(BOSMiner, S19jPro): + pass diff --git a/pyasic/miners/btc/antminer/bosminer/X19/T19.py b/pyasic/miners/antminer/bosminer/X19/T19.py similarity index 94% rename from pyasic/miners/btc/antminer/bosminer/X19/T19.py rename to pyasic/miners/antminer/bosminer/X19/T19.py index d72bd383..e405ac8a 100644 --- a/pyasic/miners/btc/antminer/bosminer/X19/T19.py +++ b/pyasic/miners/antminer/bosminer/X19/T19.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module +from pyasic.miners.types import T19 class BOSMinerT19(BOSMiner, T19): diff --git a/pyasic/miners/antminer/bosminer/X19/__init__.py b/pyasic/miners/antminer/bosminer/X19/__init__.py new file mode 100644 index 00000000..5be29194 --- /dev/null +++ b/pyasic/miners/antminer/bosminer/X19/__init__.py @@ -0,0 +1,24 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from .S19 import ( + BOSMinerS19, + BOSMinerS19j, + BOSMinerS19jNoPIC, + BOSMinerS19jPro, + BOSMinerS19Pro, +) +from .T19 import BOSMinerT19 diff --git a/pyasic/miners/btc/antminer/bosminer/X9/S9.py b/pyasic/miners/antminer/bosminer/X9/S9.py similarity index 94% rename from pyasic/miners/btc/antminer/bosminer/X9/S9.py rename to pyasic/miners/antminer/bosminer/X9/S9.py index 8977701a..dab09196 100644 --- a/pyasic/miners/btc/antminer/bosminer/X9/S9.py +++ b/pyasic/miners/antminer/bosminer/X9/S9.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S9 # noqa - Ignore access to _module +from pyasic.miners.types import S9 class BOSMinerS9(BOSMiner, S9): diff --git a/pyasic/miners/btc/antminer/bosminer/X9/__init__.py b/pyasic/miners/antminer/bosminer/X9/__init__.py similarity index 100% rename from pyasic/miners/btc/antminer/bosminer/X9/__init__.py rename to pyasic/miners/antminer/bosminer/X9/__init__.py diff --git a/pyasic/miners/btc/antminer/bosminer/__init__.py b/pyasic/miners/antminer/bosminer/__init__.py similarity index 100% rename from pyasic/miners/btc/antminer/bosminer/__init__.py rename to pyasic/miners/antminer/bosminer/__init__.py diff --git a/pyasic/miners/zec/antminer/cgminer/X15/Z15.py b/pyasic/miners/antminer/cgminer/X15/Z15.py similarity index 94% rename from pyasic/miners/zec/antminer/cgminer/X15/Z15.py rename to pyasic/miners/antminer/cgminer/X15/Z15.py index 85e711a4..8fd71aa5 100644 --- a/pyasic/miners/zec/antminer/cgminer/X15/Z15.py +++ b/pyasic/miners/antminer/cgminer/X15/Z15.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerOld -from pyasic.miners.zec._types import Z15 # noqa - Ignore access to _module +from pyasic.miners.types import Z15 class CGMinerZ15(AntminerOld, Z15): diff --git a/pyasic/miners/zec/antminer/cgminer/X15/__init__.py b/pyasic/miners/antminer/cgminer/X15/__init__.py similarity index 100% rename from pyasic/miners/zec/antminer/cgminer/X15/__init__.py rename to pyasic/miners/antminer/cgminer/X15/__init__.py diff --git a/pyasic/miners/dsh/antminer/cgminer/X3/D3.py b/pyasic/miners/antminer/cgminer/X3/D3.py similarity index 94% rename from pyasic/miners/dsh/antminer/cgminer/X3/D3.py rename to pyasic/miners/antminer/cgminer/X3/D3.py index 27e47415..9ffc4d0a 100644 --- a/pyasic/miners/dsh/antminer/cgminer/X3/D3.py +++ b/pyasic/miners/antminer/cgminer/X3/D3.py @@ -13,9 +13,8 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ - from pyasic.miners.backends import AntminerOld -from pyasic.miners.dsh._types import D3 # noqa - Ignore access to _module +from pyasic.miners.types import D3 class CGMinerD3(AntminerOld, D3): diff --git a/pyasic/miners/dsh/antminer/cgminer/X3/__init__.py b/pyasic/miners/antminer/cgminer/X3/__init__.py similarity index 99% rename from pyasic/miners/dsh/antminer/cgminer/X3/__init__.py rename to pyasic/miners/antminer/cgminer/X3/__init__.py index 19bfb0a8..23db702e 100644 --- a/pyasic/miners/dsh/antminer/cgminer/X3/__init__.py +++ b/pyasic/miners/antminer/cgminer/X3/__init__.py @@ -13,4 +13,5 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ + from .D3 import CGMinerD3 diff --git a/pyasic/miners/dcr/antminer/cgminer/X5/DR5.py b/pyasic/miners/antminer/cgminer/X5/DR5.py similarity index 94% rename from pyasic/miners/dcr/antminer/cgminer/X5/DR5.py rename to pyasic/miners/antminer/cgminer/X5/DR5.py index 6836aade..cec1efe3 100644 --- a/pyasic/miners/dcr/antminer/cgminer/X5/DR5.py +++ b/pyasic/miners/antminer/cgminer/X5/DR5.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import AntminerOld -from pyasic.miners.dcr._types import DR5 # noqa - Ignore access to _module +from pyasic.miners.types import DR5 class CGMinerDR5(AntminerOld, DR5): diff --git a/pyasic/miners/dcr/antminer/cgminer/X5/__init__.py b/pyasic/miners/antminer/cgminer/X5/__init__.py similarity index 100% rename from pyasic/miners/dcr/antminer/cgminer/X5/__init__.py rename to pyasic/miners/antminer/cgminer/X5/__init__.py diff --git a/pyasic/miners/zec/_types/antminer/__init__.py b/pyasic/miners/antminer/cgminer/__init__.py similarity index 97% rename from pyasic/miners/zec/_types/antminer/__init__.py rename to pyasic/miners/antminer/cgminer/__init__.py index 87dc09f5..fa4f83e0 100644 --- a/pyasic/miners/zec/_types/antminer/__init__.py +++ b/pyasic/miners/antminer/cgminer/__init__.py @@ -13,4 +13,7 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ + +from .X3 import * +from .X5 import * from .X15 import * diff --git a/pyasic/miners/btc/antminer/hiveon/X9/T9.py b/pyasic/miners/antminer/hiveon/X9/T9.py similarity index 96% rename from pyasic/miners/btc/antminer/hiveon/X9/T9.py rename to pyasic/miners/antminer/hiveon/X9/T9.py index 8fe80344..2230f17e 100644 --- a/pyasic/miners/btc/antminer/hiveon/X9/T9.py +++ b/pyasic/miners/antminer/hiveon/X9/T9.py @@ -20,8 +20,8 @@ import asyncssh from pyasic.data import HashBoard from pyasic.errors import APIError -from pyasic.miners.backends import Hiveon # noqa - Ignore access to _module -from pyasic.miners.btc._types import T9 # noqa - Ignore access to _module +from pyasic.miners.backends import Hiveon +from pyasic.miners.types import T9 class HiveonT9(Hiveon, T9): diff --git a/pyasic/miners/btc/antminer/hiveon/X9/__init__.py b/pyasic/miners/antminer/hiveon/X9/__init__.py similarity index 100% rename from pyasic/miners/btc/antminer/hiveon/X9/__init__.py rename to pyasic/miners/antminer/hiveon/X9/__init__.py diff --git a/pyasic/miners/btc/antminer/hiveon/__init__.py b/pyasic/miners/antminer/hiveon/__init__.py similarity index 100% rename from pyasic/miners/btc/antminer/hiveon/__init__.py rename to pyasic/miners/antminer/hiveon/__init__.py diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19j_Pro.py b/pyasic/miners/antminer/vnish/X19/S19.py similarity index 76% rename from pyasic/miners/btc/antminer/vnish/X19/S19j_Pro.py rename to pyasic/miners/antminer/vnish/X19/S19.py index d498ec33..38068688 100644 --- a/pyasic/miners/btc/antminer/vnish/X19/S19j_Pro.py +++ b/pyasic/miners/antminer/vnish/X19/S19.py @@ -14,8 +14,32 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module +from pyasic.miners.backends import VNish +from pyasic.miners.types import S19, S19XP, S19a, S19aPro, S19j, S19jPro, S19Pro + + +class VNishS19(VNish, S19): + pass + + +class VNishS19Pro(VNish, S19Pro): + pass + + +class VNishS19XP(VNish, S19XP): + pass + + +class VNishS19a(VNish, S19a): + pass + + +class VNishS19aPro(VNish, S19aPro): + pass + + +class VNishS19j(VNish, S19j): + pass class VNishS19jPro(VNish, S19jPro): diff --git a/pyasic/miners/btc/avalonminer/cgminer/A7X/A7X.py b/pyasic/miners/antminer/vnish/X19/T19.py similarity index 91% rename from pyasic/miners/btc/avalonminer/cgminer/A7X/A7X.py rename to pyasic/miners/antminer/vnish/X19/T19.py index 58700438..bbc7f5de 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A7X/A7X.py +++ b/pyasic/miners/antminer/vnish/X19/T19.py @@ -14,8 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.backends import CGMinerAvalon # noqa - Ignore access to _module +from pyasic.miners.backends import VNish +from pyasic.miners.types import T19 -class CGMinerA7X(CGMinerAvalon): +class VNishT19(VNish, T19): pass diff --git a/pyasic/miners/antminer/vnish/X19/__init__.py b/pyasic/miners/antminer/vnish/X19/__init__.py new file mode 100644 index 00000000..268059c0 --- /dev/null +++ b/pyasic/miners/antminer/vnish/X19/__init__.py @@ -0,0 +1,26 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from .S19 import ( + VNishS19, + VNishS19a, + VNishS19aPro, + VNishS19j, + VNishS19jPro, + VNishS19Pro, + VNishS19XP, +) +from .T19 import VNishT19 diff --git a/pyasic/miners/ltc/antminer/vnish/X3/L3_Plus.py b/pyasic/miners/antminer/vnish/X3/L3.py similarity index 94% rename from pyasic/miners/ltc/antminer/vnish/X3/L3_Plus.py rename to pyasic/miners/antminer/vnish/X3/L3.py index 6095cba1..9d53ccaa 100644 --- a/pyasic/miners/ltc/antminer/vnish/X3/L3_Plus.py +++ b/pyasic/miners/antminer/vnish/X3/L3.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import VNish -from pyasic.miners.ltc._types import L3Plus # noqa - Ignore access to _module +from pyasic.miners.types import L3Plus class VnishL3Plus(VNish, L3Plus): diff --git a/pyasic/miners/btc/innosilicon/cgminer/__init__.py b/pyasic/miners/antminer/vnish/X3/__init__.py similarity index 97% rename from pyasic/miners/btc/innosilicon/cgminer/__init__.py rename to pyasic/miners/antminer/vnish/X3/__init__.py index f9332d03..731db6fa 100644 --- a/pyasic/miners/btc/innosilicon/cgminer/__init__.py +++ b/pyasic/miners/antminer/vnish/X3/__init__.py @@ -14,4 +14,4 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from .T3X import * +from .L3 import VnishL3Plus diff --git a/pyasic/miners/btc/antminer/vnish/__init__.py b/pyasic/miners/antminer/vnish/__init__.py similarity index 98% rename from pyasic/miners/btc/antminer/vnish/__init__.py rename to pyasic/miners/antminer/vnish/__init__.py index 36309a49..1a3d7d49 100644 --- a/pyasic/miners/btc/antminer/vnish/__init__.py +++ b/pyasic/miners/antminer/vnish/__init__.py @@ -14,4 +14,5 @@ # limitations under the License. - # ------------------------------------------------------------------------------ +from .X3 import * from .X19 import * diff --git a/pyasic/miners/btc/avalonminer/__init__.py b/pyasic/miners/avalonminer/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/__init__.py rename to pyasic/miners/avalonminer/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/A10X/A1026.py b/pyasic/miners/avalonminer/cgminer/A10X/A1026.py similarity index 88% rename from pyasic/miners/btc/avalonminer/cgminer/A10X/A1026.py rename to pyasic/miners/avalonminer/cgminer/A10X/A1026.py index 40734a36..906604e9 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A10X/A1026.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A1026.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon1026 # noqa - Ignore access to _module - -from .A10X import CGMinerA10X +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon1026 -class CGMinerAvalon1026(CGMinerA10X, Avalon1026): +class CGMinerAvalon1026(CGMinerAvalon, Avalon1026): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A10X/A1047.py b/pyasic/miners/avalonminer/cgminer/A10X/A1047.py similarity index 88% rename from pyasic/miners/btc/avalonminer/cgminer/A10X/A1047.py rename to pyasic/miners/avalonminer/cgminer/A10X/A1047.py index 93065736..377b4ead 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A10X/A1047.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A1047.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon1047 # noqa - Ignore access to _module - -from .A10X import CGMinerA10X +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon1047 -class CGMinerAvalon1047(CGMinerA10X, Avalon1047): +class CGMinerAvalon1047(CGMinerAvalon, Avalon1047): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A10X/A1066.py b/pyasic/miners/avalonminer/cgminer/A10X/A1066.py similarity index 88% rename from pyasic/miners/btc/avalonminer/cgminer/A10X/A1066.py rename to pyasic/miners/avalonminer/cgminer/A10X/A1066.py index 6e33496e..56722ba6 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A10X/A1066.py +++ b/pyasic/miners/avalonminer/cgminer/A10X/A1066.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon1066 # noqa - Ignore access to _module - -from .A10X import CGMinerA10X +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon1066 -class CGMinerAvalon1066(CGMinerA10X, Avalon1066): +class CGMinerAvalon1066(CGMinerAvalon, Avalon1066): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A10X/__init__.py b/pyasic/miners/avalonminer/cgminer/A10X/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/A10X/__init__.py rename to pyasic/miners/avalonminer/cgminer/A10X/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/A11X/A1166.py b/pyasic/miners/avalonminer/cgminer/A11X/A1166.py similarity index 88% rename from pyasic/miners/btc/avalonminer/cgminer/A11X/A1166.py rename to pyasic/miners/avalonminer/cgminer/A11X/A1166.py index a476486b..0fc0f911 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A11X/A1166.py +++ b/pyasic/miners/avalonminer/cgminer/A11X/A1166.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon1166Pro # noqa - -from .A11X import CGMinerA11X +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon1166Pro -class CGMinerAvalon1166Pro(CGMinerA11X, Avalon1166Pro): +class CGMinerAvalon1166Pro(CGMinerAvalon, Avalon1166Pro): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A11X/__init__.py b/pyasic/miners/avalonminer/cgminer/A11X/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/A11X/__init__.py rename to pyasic/miners/avalonminer/cgminer/A11X/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/A12X/A1246.py b/pyasic/miners/avalonminer/cgminer/A12X/A1246.py similarity index 89% rename from pyasic/miners/btc/avalonminer/cgminer/A12X/A1246.py rename to pyasic/miners/avalonminer/cgminer/A12X/A1246.py index 9a425bbf..228235c3 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A12X/A1246.py +++ b/pyasic/miners/avalonminer/cgminer/A12X/A1246.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon1246 - -from .A12X import CGMinerA12X +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon1246 -class CGMinerAvalon1246(CGMinerA12X, Avalon1246): +class CGMinerAvalon1246(CGMinerAvalon, Avalon1246): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A12X/__init__.py b/pyasic/miners/avalonminer/cgminer/A12X/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/A12X/__init__.py rename to pyasic/miners/avalonminer/cgminer/A12X/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/A7X/A721.py b/pyasic/miners/avalonminer/cgminer/A7X/A721.py similarity index 86% rename from pyasic/miners/btc/avalonminer/cgminer/A7X/A721.py rename to pyasic/miners/avalonminer/cgminer/A7X/A721.py index 48db64ba..5f6afd61 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A7X/A721.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A721.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon721 # noqa - Ignore access to _module - -from .A7X import CGMinerA7X # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon721 -class CGMinerAvalon721(CGMinerA7X, Avalon721): +class CGMinerAvalon721(CGMinerAvalon, Avalon721): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A7X/A741.py b/pyasic/miners/avalonminer/cgminer/A7X/A741.py similarity index 86% rename from pyasic/miners/btc/avalonminer/cgminer/A7X/A741.py rename to pyasic/miners/avalonminer/cgminer/A7X/A741.py index ce12ae0f..0a9c4635 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A7X/A741.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A741.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon741 # noqa - Ignore access to _module - -from .A7X import CGMinerA7X # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon741 -class CGMinerAvalon741(CGMinerA7X, Avalon741): +class CGMinerAvalon741(CGMinerAvalon, Avalon741): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A7X/A761.py b/pyasic/miners/avalonminer/cgminer/A7X/A761.py similarity index 86% rename from pyasic/miners/btc/avalonminer/cgminer/A7X/A761.py rename to pyasic/miners/avalonminer/cgminer/A7X/A761.py index 68a04a32..b7b6880b 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A7X/A761.py +++ b/pyasic/miners/avalonminer/cgminer/A7X/A761.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon761 # noqa - Ignore access to _module - -from .A7X import CGMinerA7X # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon761 -class CGMinerAvalon761(CGMinerA7X, Avalon761): +class CGMinerAvalon761(CGMinerAvalon, Avalon761): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A7X/__init__.py b/pyasic/miners/avalonminer/cgminer/A7X/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/A7X/__init__.py rename to pyasic/miners/avalonminer/cgminer/A7X/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/A8X/A821.py b/pyasic/miners/avalonminer/cgminer/A8X/A821.py similarity index 86% rename from pyasic/miners/btc/avalonminer/cgminer/A8X/A821.py rename to pyasic/miners/avalonminer/cgminer/A8X/A821.py index 0f323d13..d439b0cf 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A8X/A821.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A821.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon821 # noqa - Ignore access to _module - -from .A8X import CGMinerA8X # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon821 -class CGMinerAvalon821(CGMinerA8X, Avalon821): +class CGMinerAvalon821(CGMinerAvalon, Avalon821): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A8X/A841.py b/pyasic/miners/avalonminer/cgminer/A8X/A841.py similarity index 86% rename from pyasic/miners/btc/avalonminer/cgminer/A8X/A841.py rename to pyasic/miners/avalonminer/cgminer/A8X/A841.py index 2d3691a9..063638de 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A8X/A841.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A841.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon841 # noqa - Ignore access to _module - -from .A8X import CGMinerA8X # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon841 -class CGMinerAvalon841(CGMinerA8X, Avalon841): +class CGMinerAvalon841(CGMinerAvalon, Avalon841): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A8X/A851.py b/pyasic/miners/avalonminer/cgminer/A8X/A851.py similarity index 86% rename from pyasic/miners/btc/avalonminer/cgminer/A8X/A851.py rename to pyasic/miners/avalonminer/cgminer/A8X/A851.py index 0a7b8716..7378bebd 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A8X/A851.py +++ b/pyasic/miners/avalonminer/cgminer/A8X/A851.py @@ -14,10 +14,9 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.btc._types import Avalon851 # noqa - Ignore access to _module - -from .A8X import CGMinerA8X # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon851 -class CGMinerAvalon851(CGMinerA8X, Avalon851): +class CGMinerAvalon851(CGMinerAvalon, Avalon851): pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A8X/__init__.py b/pyasic/miners/avalonminer/cgminer/A8X/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/A8X/__init__.py rename to pyasic/miners/avalonminer/cgminer/A8X/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/A9X/A921.py b/pyasic/miners/avalonminer/cgminer/A9X/A921.py similarity index 88% rename from pyasic/miners/btc/avalonminer/cgminer/A9X/A921.py rename to pyasic/miners/avalonminer/cgminer/A9X/A921.py index cbd4f759..fd5b4937 100644 --- a/pyasic/miners/btc/avalonminer/cgminer/A9X/A921.py +++ b/pyasic/miners/avalonminer/cgminer/A9X/A921.py @@ -14,8 +14,8 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.backends import CGMinerAvalon # noqa - Ignore access to _module -from pyasic.miners.btc._types import Avalon921 # noqa - Ignore access to _module +from pyasic.miners.backends import CGMinerAvalon +from pyasic.miners.types import Avalon921 class CGMinerAvalon921(CGMinerAvalon, Avalon921): diff --git a/pyasic/miners/btc/avalonminer/cgminer/A9X/__init__.py b/pyasic/miners/avalonminer/cgminer/A9X/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/A9X/__init__.py rename to pyasic/miners/avalonminer/cgminer/A9X/__init__.py diff --git a/pyasic/miners/btc/_types/avalonminer/__init__.py b/pyasic/miners/avalonminer/cgminer/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/__init__.py rename to pyasic/miners/avalonminer/cgminer/__init__.py diff --git a/pyasic/miners/btc/__init__.py b/pyasic/miners/btc/__init__.py deleted file mode 100644 index 0e6a1720..00000000 --- a/pyasic/miners/btc/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * -from .avalonminer import * -from .innosilicon import * -from .whatsminer import * diff --git a/pyasic/miners/btc/_types/antminer/X17/S17.py b/pyasic/miners/btc/_types/antminer/X17/S17.py deleted file mode 100644 index 9e93bead..00000000 --- a/pyasic/miners/btc/_types/antminer/X17/S17.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S17(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S17" - self.nominal_chips = 48 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X17/S17_Plus.py b/pyasic/miners/btc/_types/antminer/X17/S17_Plus.py deleted file mode 100644 index 5db29136..00000000 --- a/pyasic/miners/btc/_types/antminer/X17/S17_Plus.py +++ /dev/null @@ -1,25 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S17Plus(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.model = "S17+" - self.nominal_chips = 65 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X17/S17e.py b/pyasic/miners/btc/_types/antminer/X17/S17e.py deleted file mode 100644 index da6c8660..00000000 --- a/pyasic/miners/btc/_types/antminer/X17/S17e.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S17e(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S17e" - self.nominal_chips = 135 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X17/T17.py b/pyasic/miners/btc/_types/antminer/X17/T17.py deleted file mode 100644 index 313e00c3..00000000 --- a/pyasic/miners/btc/_types/antminer/X17/T17.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class T17(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "T17" - self.nominal_chips = 30 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X17/T17_Plus.py b/pyasic/miners/btc/_types/antminer/X17/T17_Plus.py deleted file mode 100644 index fecbe367..00000000 --- a/pyasic/miners/btc/_types/antminer/X17/T17_Plus.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class T17Plus(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "T17+" - self.nominal_chips = 44 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X17/T17e.py b/pyasic/miners/btc/_types/antminer/X17/T17e.py deleted file mode 100644 index 915def9a..00000000 --- a/pyasic/miners/btc/_types/antminer/X17/T17e.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class T17e(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "T17e" - self.nominal_chips = 78 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19.py b/pyasic/miners/btc/_types/antminer/X19/S19.py deleted file mode 100644 index bec2057c..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19" - self.nominal_chips = 76 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19L.py b/pyasic/miners/btc/_types/antminer/X19/S19L.py deleted file mode 100644 index a7b782f6..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19L.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19L(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19L" - self.nominal_chips = 76 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19_Pro.py b/pyasic/miners/btc/_types/antminer/X19/S19_Pro.py deleted file mode 100644 index c1fe887f..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19_Pro.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19Pro(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19 Pro" - self.nominal_chips = 114 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19_Pro_Plus.py b/pyasic/miners/btc/_types/antminer/X19/S19_Pro_Plus.py deleted file mode 100644 index dc22fd04..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19_Pro_Plus.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19ProPlus(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19 Pro+" - self.nominal_chips = 120 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19_XP.py b/pyasic/miners/btc/_types/antminer/X19/S19_XP.py deleted file mode 100644 index b5844cf7..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19_XP.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19XP(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19 XP" - self.nominal_chips = 110 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19a.py b/pyasic/miners/btc/_types/antminer/X19/S19a.py deleted file mode 100644 index ad8d73f7..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19a.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19a(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19a" - self.nominal_chips = 72 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py b/pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py deleted file mode 100644 index af35e493..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19a_Pro.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19aPro(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19a Pro" - self.nominal_chips = 100 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py b/pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py deleted file mode 100644 index 837f8fe2..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/S19j_Pro.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S19jPro(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S19j Pro" - self.nominal_chips = 126 - self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/__init__.py b/pyasic/miners/btc/_types/antminer/X19/__init__.py deleted file mode 100644 index 236c7a52..00000000 --- a/pyasic/miners/btc/_types/antminer/X19/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S19 import S19 -from .S19_Pro import S19Pro -from .S19_Pro_Plus import S19ProPlus -from .S19_XP import S19XP -from .S19a import S19a -from .S19a_Pro import S19aPro -from .S19j import S19j, S19jNoPIC -from .S19j_Pro import S19jPro -from .S19L import S19L -from .T19 import T19 diff --git a/pyasic/miners/btc/_types/antminer/X9/S9.py b/pyasic/miners/btc/_types/antminer/X9/S9.py deleted file mode 100644 index d184e4be..00000000 --- a/pyasic/miners/btc/_types/antminer/X9/S9.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S9(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S9" - self.nominal_chips = 63 - self.fan_count = 2 diff --git a/pyasic/miners/btc/_types/antminer/X9/S9j.py b/pyasic/miners/btc/_types/antminer/X9/S9j.py deleted file mode 100644 index e786a5cb..00000000 --- a/pyasic/miners/btc/_types/antminer/X9/S9j.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.makes import AntMiner - - -class S9j(AntMiner): # noqa - ignore ABC method implementation - def __init__(self, ip: str, api_ver: str = "0.0.0"): - super().__init__(ip, api_ver) - self.ip = ip - self.model = "S9j" - self.nominal_chips = 63 - self.fan_count = 2 diff --git a/pyasic/miners/btc/_types/antminer/__init__.py b/pyasic/miners/btc/_types/antminer/__init__.py deleted file mode 100644 index d4d4051b..00000000 --- a/pyasic/miners/btc/_types/antminer/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X9 import * -from .X17 import * -from .X19 import * diff --git a/pyasic/miners/btc/antminer/bmminer/X17/S17.py b/pyasic/miners/btc/antminer/bmminer/X17/S17.py deleted file mode 100644 index de79a28a..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/S17.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import S17 # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerS17(BMMinerX17, S17): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py b/pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py deleted file mode 100644 index 6ae14866..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/S17_Plus.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import S17Plus # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerS17Plus(BMMinerX17, S17Plus): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py b/pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py deleted file mode 100644 index 3c6cd203..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/S17_Pro.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import S17Pro # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerS17Pro(BMMinerX17, S17Pro): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/S17e.py b/pyasic/miners/btc/antminer/bmminer/X17/S17e.py deleted file mode 100644 index 1c040fef..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/S17e.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import S17e # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerS17e(BMMinerX17, S17e): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/T17.py b/pyasic/miners/btc/antminer/bmminer/X17/T17.py deleted file mode 100644 index 1a8ce2f8..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/T17.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import T17 # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerT17(BMMinerX17, T17): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py b/pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py deleted file mode 100644 index 43cdcfd3..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/T17_Plus.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import T17Plus # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerT17Plus(BMMinerX17, T17Plus): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/T17e.py b/pyasic/miners/btc/antminer/bmminer/X17/T17e.py deleted file mode 100644 index 07f0799a..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/T17e.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.btc._types import T17e # noqa - Ignore access to _module - -from .X17 import BMMinerX17 - - -class BMMinerT17e(BMMinerX17, T17e): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/X17.py b/pyasic/miners/btc/antminer/bmminer/X17/X17.py deleted file mode 100644 index 86c2a876..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/X17.py +++ /dev/null @@ -1,83 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from typing import Union - -from pyasic.miners.backends import BMMiner -from pyasic.web.antminer import AntminerOldWebAPI - - -class BMMinerX17(BMMiner): - def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: - super().__init__(ip, api_ver=api_ver) - self.ip = ip - self.web = AntminerOldWebAPI(ip) - - async def get_mac(self) -> Union[str, None]: - try: - data = await self.web.get_system_info() - if data: - return data["macaddr"] - except KeyError: - pass - - async def fault_light_on(self) -> bool: - # this should time out, after it does do a check - await self.web.blink(blink=True) - try: - data = await self.web.get_blink_status() - if data: - if data["isBlinking"]: - self.light = True - except KeyError: - pass - return self.light - - async def fault_light_off(self) -> bool: - await self.web.blink(blink=False) - try: - data = await self.web.get_blink_status() - if data: - if not data["isBlinking"]: - self.light = False - except KeyError: - pass - return self.light - - async def reboot(self) -> bool: - data = await self.web.reboot() - if data: - return True - return False - - async def get_fault_light(self) -> bool: - if self.light: - return self.light - try: - data = await self.web.get_blink_status() - if data: - self.light = data["isBlinking"] - except KeyError: - pass - return self.light - - async def get_hostname(self) -> Union[str, None]: - try: - data = await self.web.get_system_info() - if data: - return data["hostname"] - except KeyError: - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X17/__init__.py b/pyasic/miners/btc/antminer/bmminer/X17/__init__.py deleted file mode 100644 index bb78ebfb..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X17/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S17 import BMMinerS17 -from .S17_Plus import BMMinerS17Plus -from .S17_Pro import BMMinerS17Pro -from .S17e import BMMinerS17e -from .T17 import BMMinerT17 -from .T17_Plus import BMMinerT17Plus -from .T17e import BMMinerT17e diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19.py b/pyasic/miners/btc/antminer/bmminer/X19/S19.py deleted file mode 100644 index 6e6318f9..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module - -# noqa - Ignore access to _module - - -class BMMinerS19(AntminerModern, S19): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19L.py b/pyasic/miners/btc/antminer/bmminer/X19/S19L.py deleted file mode 100644 index 9795a78c..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19L.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19L # noqa - Ignore access to _module - - -class BMMinerS19L(AntminerModern, S19L): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py b/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py deleted file mode 100644 index 98ca128f..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19_Pro.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module - -# noqa - Ignore access to _module - - -class BMMinerS19Pro(AntminerModern, S19Pro): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py b/pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py deleted file mode 100644 index 1324f727..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19_XP.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19XP # noqa - Ignore access to _module - -# noqa - Ignore access to _module - - -class BMMinerS19XP(AntminerModern, S19XP): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19a.py b/pyasic/miners/btc/antminer/bmminer/X19/S19a.py deleted file mode 100644 index b42b5977..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19a.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19a # noqa - Ignore access to _module - -# noqa - Ignore access to _module - - -class BMMinerS19a(AntminerModern, S19a): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py b/pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py deleted file mode 100644 index f0e57561..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19a_Pro.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19aPro # noqa - Ignore access to _module - -# noqa - Ignore access to _module - - -class BMMinerS19aPro(AntminerModern, S19aPro): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py deleted file mode 100644 index 56520b14..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/S19j_Pro.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import AntminerModern -from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module - -# noqa - Ignore access to _module - - -class BMMinerS19jPro(AntminerModern, S19jPro): - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X19/__init__.py b/pyasic/miners/btc/antminer/bmminer/X19/__init__.py deleted file mode 100644 index a4e7983e..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X19/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S19 import BMMinerS19 -from .S19_Pro import BMMinerS19Pro -from .S19_Pro_Plus import BMMinerS19ProPlus -from .S19_XP import BMMinerS19XP -from .S19a import BMMinerS19a -from .S19a_Pro import BMMinerS19aPro -from .S19j import BMMinerS19j, BMMinerS19jNoPIC -from .S19j_Pro import BMMinerS19jPro -from .S19L import BMMinerS19L -from .T19 import BMMinerT19 diff --git a/pyasic/miners/btc/antminer/bmminer/X9/S9.py b/pyasic/miners/btc/antminer/bmminer/X9/S9.py deleted file mode 100644 index b4758cbf..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X9/S9.py +++ /dev/null @@ -1,43 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from typing import Union - -from pyasic.miners.backends import BMMiner -from pyasic.miners.btc._types import S9 # noqa - Ignore access to _module -from pyasic.web.S9 import S9WebAPI - - -class BMMinerS9(BMMiner, S9): - def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: - super().__init__(ip, api_ver=api_ver) - self.ip = ip - self.web = S9WebAPI(ip) - - async def get_mac(self) -> Union[str, None]: - try: - data = await self.web.get_system_info() - if data: - return data["macaddr"] - except KeyError: - pass - - try: - data = await self.web.get_network_info() - if data: - return data["macaddr"] - except KeyError: - pass diff --git a/pyasic/miners/btc/antminer/bmminer/X9/S9j.py b/pyasic/miners/btc/antminer/bmminer/X9/S9j.py deleted file mode 100644 index 561745a0..00000000 --- a/pyasic/miners/btc/antminer/bmminer/X9/S9j.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BMMiner -from pyasic.miners.btc._types import S9j # noqa - Ignore access to _module - - -class BMMinerS9j(BMMiner, S9j): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/S17.py b/pyasic/miners/btc/antminer/bosminer/X17/S17.py deleted file mode 100644 index 0ef3ab48..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X17/S17.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S17 # noqa - Ignore access to _module - - -class BOSMinerS17(BOSMiner, S17): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py b/pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py deleted file mode 100644 index 438b905f..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X17/S17_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S17Pro # noqa - Ignore access to _module - - -class BOSMinerS17Pro(BOSMiner, S17Pro): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/S17e.py b/pyasic/miners/btc/antminer/bosminer/X17/S17e.py deleted file mode 100644 index 7c560444..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X17/S17e.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S17e # noqa - Ignore access to _module - - -class BOSMinerS17e(BOSMiner, S17e): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/T17.py b/pyasic/miners/btc/antminer/bosminer/X17/T17.py deleted file mode 100644 index 32423f78..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X17/T17.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import T17 # noqa - Ignore access to _module - - -class BOSMinerT17(BOSMiner, T17): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/T17e.py b/pyasic/miners/btc/antminer/bosminer/X17/T17e.py deleted file mode 100644 index cc2b4183..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X17/T17e.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import T17e # noqa - Ignore access to _module - - -class BOSMinerT17e(BOSMiner, T17e): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X17/__init__.py b/pyasic/miners/btc/antminer/bosminer/X17/__init__.py deleted file mode 100644 index 9f946a28..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X17/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S17 import BOSMinerS17 -from .S17_Plus import BOSMinerS17Plus -from .S17_Pro import BOSMinerS17Pro -from .S17e import BOSMinerS17e -from .T17 import BOSMinerT17 -from .T17_Plus import BOSMinerT17Plus -from .T17e import BOSMinerT17e diff --git a/pyasic/miners/btc/antminer/bosminer/X19/S19.py b/pyasic/miners/btc/antminer/bosminer/X19/S19.py deleted file mode 100644 index 01f939f0..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X19/S19.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module - - -class BOSMinerS19(BOSMiner, S19): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py b/pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py deleted file mode 100644 index ebd551a1..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X19/S19_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module - - -class BOSMinerS19Pro(BOSMiner, S19Pro): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py deleted file mode 100644 index 334cf12e..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X19/S19j_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import BOSMiner -from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module - - -class BOSMinerS19jPro(BOSMiner, S19jPro): - pass diff --git a/pyasic/miners/btc/antminer/bosminer/X19/__init__.py b/pyasic/miners/btc/antminer/bosminer/X19/__init__.py deleted file mode 100644 index b6f3e1eb..00000000 --- a/pyasic/miners/btc/antminer/bosminer/X19/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S19 import BOSMinerS19 -from .S19_Pro import BOSMinerS19Pro -from .S19j import BOSMinerS19j, BOSMinerS19jNoPIC -from .S19j_Pro import BOSMinerS19jPro -from .T19 import BOSMinerT19 diff --git a/pyasic/miners/btc/antminer/cgminer/X17/S17.py b/pyasic/miners/btc/antminer/cgminer/X17/S17.py deleted file mode 100644 index a6666de0..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/S17.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S17 # noqa - Ignore access to _module - - -class CGMinerS17(CGMiner, S17): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py b/pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py deleted file mode 100644 index 2e3dc91f..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/S17_Plus.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S17Plus # noqa - Ignore access to _module - - -class CGMinerS17Plus(CGMiner, S17Plus): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py b/pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py deleted file mode 100644 index 9a676433..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/S17_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S17Pro # noqa - Ignore access to _module - - -class CGMinerS17Pro(CGMiner, S17Pro): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/S17e.py b/pyasic/miners/btc/antminer/cgminer/X17/S17e.py deleted file mode 100644 index f86132b6..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/S17e.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S17e # noqa - Ignore access to _module - - -class CGMinerS17e(CGMiner, S17e): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/T17.py b/pyasic/miners/btc/antminer/cgminer/X17/T17.py deleted file mode 100644 index 87aa5933..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/T17.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import T17 # noqa - Ignore access to _module - - -class CGMinerT17(CGMiner, T17): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py b/pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py deleted file mode 100644 index d105cba8..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/T17_Plus.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import T17Plus # noqa - Ignore access to _module - - -class CGMinerT17Plus(CGMiner, T17Plus): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/T17e.py b/pyasic/miners/btc/antminer/cgminer/X17/T17e.py deleted file mode 100644 index 3fd0f2e3..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/T17e.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import T17e # noqa - Ignore access to _module - - -class CGMinerT17e(CGMiner, T17e): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X17/__init__.py b/pyasic/miners/btc/antminer/cgminer/X17/__init__.py deleted file mode 100644 index 083d618a..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X17/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S17 import CGMinerS17 -from .S17_Plus import CGMinerS17Plus -from .S17_Pro import CGMinerS17Pro -from .S17e import CGMinerS17e -from .T17 import CGMinerT17 -from .T17_Plus import CGMinerT17Plus -from .T17e import CGMinerT17e diff --git a/pyasic/miners/btc/antminer/cgminer/X19/S19.py b/pyasic/miners/btc/antminer/cgminer/X19/S19.py deleted file mode 100644 index c2b6d938..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X19/S19.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module - - -class CGMinerS19(CGMiner, S19): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py b/pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py deleted file mode 100644 index 9220c44e..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X19/S19_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module - - -class CGMinerS19Pro(CGMiner, S19Pro): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X19/S19j.py b/pyasic/miners/btc/antminer/cgminer/X19/S19j.py deleted file mode 100644 index 52ffe7bc..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X19/S19j.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S19j # noqa - Ignore access to _module - - -class CGMinerS19j(CGMiner, S19j): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py b/pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py deleted file mode 100644 index 1c6ed423..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X19/S19j_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S19jPro # noqa - Ignore access to _module - - -class CGMinerS19jPro(CGMiner, S19jPro): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X19/T19.py b/pyasic/miners/btc/antminer/cgminer/X19/T19.py deleted file mode 100644 index 4b8e5f7a..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X19/T19.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module - - -class CGMinerT19(CGMiner, T19): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X19/__init__.py b/pyasic/miners/btc/antminer/cgminer/X19/__init__.py deleted file mode 100644 index 342b9d42..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X19/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S19 import CGMinerS19 -from .S19_Pro import CGMinerS19Pro -from .S19j import CGMinerS19j -from .S19j_Pro import CGMinerS19jPro -from .T19 import CGMinerT19 diff --git a/pyasic/miners/btc/antminer/cgminer/X9/S9.py b/pyasic/miners/btc/antminer/cgminer/X9/S9.py deleted file mode 100644 index 80a0c361..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X9/S9.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMiner -from pyasic.miners.btc._types import S9 # noqa - Ignore access to _module - - -class CGMinerS9(CGMiner, S9): - pass diff --git a/pyasic/miners/btc/antminer/cgminer/X9/T9.py b/pyasic/miners/btc/antminer/cgminer/X9/T9.py deleted file mode 100644 index fcd2d56f..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X9/T9.py +++ /dev/null @@ -1,25 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends.cgminer import CGMiner # noqa - Ignore access to _module -from pyasic.miners.btc._types.antminer import T9 # noqa - Ignore access to _module - - -class CGMinerT9(CGMiner, T9): - def __init__(self, ip: str) -> None: - super().__init__(ip) - self.model = "T9" - self.api_type = "CGMiner" diff --git a/pyasic/miners/btc/antminer/cgminer/X9/__init__.py b/pyasic/miners/btc/antminer/cgminer/X9/__init__.py deleted file mode 100644 index b3f83547..00000000 --- a/pyasic/miners/btc/antminer/cgminer/X9/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S9 import CGMinerS9 -from .T9 import CGMinerT9 diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19.py b/pyasic/miners/btc/antminer/vnish/X19/S19.py deleted file mode 100644 index 05f77482..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/S19.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19 # noqa - Ignore access to _module - - -class VNishS19(VNish, S19): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py b/pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py deleted file mode 100644 index 5fab4038..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/S19_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19Pro # noqa - Ignore access to _module - - -class VNishS19Pro(VNish, S19Pro): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19_XP.py b/pyasic/miners/btc/antminer/vnish/X19/S19_XP.py deleted file mode 100644 index bafa7675..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/S19_XP.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19XP # noqa - Ignore access to _module - - -class VNishS19XP(VNish, S19XP): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19a.py b/pyasic/miners/btc/antminer/vnish/X19/S19a.py deleted file mode 100644 index 1582f980..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/S19a.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19a # noqa - Ignore access to _module - - -class VNishS19a(VNish, S19a): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py b/pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py deleted file mode 100644 index 08f25940..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/S19a_Pro.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19aPro # noqa - Ignore access to _module - - -class VNishS19aPro(VNish, S19aPro): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/S19j.py b/pyasic/miners/btc/antminer/vnish/X19/S19j.py deleted file mode 100644 index 1cba7a3a..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/S19j.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import S19j # noqa - Ignore access to _module - - -class VNishS19j(VNish, S19j): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/T19.py b/pyasic/miners/btc/antminer/vnish/X19/T19.py deleted file mode 100644 index fa7274b4..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/T19.py +++ /dev/null @@ -1,22 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import VNish # noqa - Ignore access to _module -from pyasic.miners.btc._types import T19 # noqa - Ignore access to _module - - -class VNishT19(VNish, T19): - pass diff --git a/pyasic/miners/btc/antminer/vnish/X19/__init__.py b/pyasic/miners/btc/antminer/vnish/X19/__init__.py deleted file mode 100644 index 834d7504..00000000 --- a/pyasic/miners/btc/antminer/vnish/X19/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .S19 import VNishS19 -from .S19_Pro import VNishS19Pro -from .S19_XP import VNishS19XP -from .S19a import VNishS19a -from .S19a_Pro import VNishS19aPro -from .S19j import VNishS19j -from .S19j_Pro import VNishS19jPro -from .T19 import VNishT19 diff --git a/pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py b/pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py deleted file mode 100644 index c3009fcb..00000000 --- a/pyasic/miners/btc/avalonminer/cgminer/A10X/A10X.py +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMinerAvalon # noqa - Ignore access to _module - - -class CGMinerA10X(CGMinerAvalon): - pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A11X/A11X.py b/pyasic/miners/btc/avalonminer/cgminer/A11X/A11X.py deleted file mode 100644 index 640dae96..00000000 --- a/pyasic/miners/btc/avalonminer/cgminer/A11X/A11X.py +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMinerAvalon # noqa - Ignore access to _module - - -class CGMinerA11X(CGMinerAvalon): - pass diff --git a/pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py b/pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py deleted file mode 100644 index 97f68a1c..00000000 --- a/pyasic/miners/btc/avalonminer/cgminer/A8X/A8X.py +++ /dev/null @@ -1,21 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from pyasic.miners.backends import CGMinerAvalon # noqa - Ignore access to _module - - -class CGMinerA8X(CGMinerAvalon): - pass diff --git a/pyasic/miners/btc/innosilicon/cgminer/T3X/__init__.py b/pyasic/miners/btc/innosilicon/cgminer/T3X/__init__.py deleted file mode 100644 index 198ebd82..00000000 --- a/pyasic/miners/btc/innosilicon/cgminer/T3X/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .T3H_Plus import CGMinerInnosiliconT3HPlus diff --git a/pyasic/miners/ckb/__init__.py b/pyasic/miners/ckb/__init__.py deleted file mode 100644 index d6d7eef1..00000000 --- a/pyasic/miners/ckb/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .goldshell import * diff --git a/pyasic/miners/ckb/_types/__init__.py b/pyasic/miners/ckb/_types/__init__.py deleted file mode 100644 index d6d7eef1..00000000 --- a/pyasic/miners/ckb/_types/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .goldshell import * diff --git a/pyasic/miners/ckb/goldshell/bfgminer/__init__.py b/pyasic/miners/ckb/goldshell/bfgminer/__init__.py deleted file mode 100644 index 9fbf21f7..00000000 --- a/pyasic/miners/ckb/goldshell/bfgminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .CKX import * diff --git a/pyasic/miners/dcr/__init__.py b/pyasic/miners/dcr/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/dcr/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/dcr/_types/__init__.py b/pyasic/miners/dcr/_types/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/dcr/_types/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/dcr/antminer/__init__.py b/pyasic/miners/dcr/antminer/__init__.py deleted file mode 100644 index 10eb58cb..00000000 --- a/pyasic/miners/dcr/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .cgminer import * diff --git a/pyasic/miners/dsh/__init__.py b/pyasic/miners/dsh/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/dsh/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/dsh/_types/__init__.py b/pyasic/miners/dsh/_types/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/dsh/_types/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/dsh/_types/antminer/X3/__init__.py b/pyasic/miners/dsh/_types/antminer/X3/__init__.py deleted file mode 100644 index 59d80a1f..00000000 --- a/pyasic/miners/dsh/_types/antminer/X3/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .D3 import D3 diff --git a/pyasic/miners/dsh/_types/antminer/__init__.py b/pyasic/miners/dsh/_types/antminer/__init__.py deleted file mode 100644 index 647fb882..00000000 --- a/pyasic/miners/dsh/_types/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * diff --git a/pyasic/miners/dsh/antminer/__init__.py b/pyasic/miners/dsh/antminer/__init__.py deleted file mode 100644 index 10eb58cb..00000000 --- a/pyasic/miners/dsh/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .cgminer import * diff --git a/pyasic/miners/dsh/antminer/cgminer/__init__.py b/pyasic/miners/dsh/antminer/cgminer/__init__.py deleted file mode 100644 index 647fb882..00000000 --- a/pyasic/miners/dsh/antminer/cgminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * diff --git a/pyasic/miners/etc/__init__.py b/pyasic/miners/etc/__init__.py deleted file mode 100644 index ab44c8ba..00000000 --- a/pyasic/miners/etc/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * -from .innosilicon import * diff --git a/pyasic/miners/etc/_types/__init__.py b/pyasic/miners/etc/_types/__init__.py deleted file mode 100644 index ab44c8ba..00000000 --- a/pyasic/miners/etc/_types/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * -from .innosilicon import * diff --git a/pyasic/miners/etc/_types/antminer/X9/__init__.py b/pyasic/miners/etc/_types/antminer/X9/__init__.py deleted file mode 100644 index b2daa9d8..00000000 --- a/pyasic/miners/etc/_types/antminer/X9/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .E9_Pro import E9Pro diff --git a/pyasic/miners/etc/_types/antminer/__init__.py b/pyasic/miners/etc/_types/antminer/__init__.py deleted file mode 100644 index 27ba91cc..00000000 --- a/pyasic/miners/etc/_types/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X9 import * diff --git a/pyasic/miners/etc/antminer/__init__.py b/pyasic/miners/etc/antminer/__init__.py deleted file mode 100644 index a21b2ce9..00000000 --- a/pyasic/miners/etc/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .bmminer import * diff --git a/pyasic/miners/etc/antminer/bmminer/X9/__init__.py b/pyasic/miners/etc/antminer/bmminer/X9/__init__.py deleted file mode 100644 index a9fc3ea1..00000000 --- a/pyasic/miners/etc/antminer/bmminer/X9/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .E9_Pro import BMMinerE9Pro diff --git a/pyasic/miners/etc/antminer/bmminer/__init__.py b/pyasic/miners/etc/antminer/bmminer/__init__.py deleted file mode 100644 index 27ba91cc..00000000 --- a/pyasic/miners/etc/antminer/bmminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X9 import * diff --git a/pyasic/miners/etc/innosilicon/__init__.py b/pyasic/miners/etc/innosilicon/__init__.py deleted file mode 100644 index 5d1891a7..00000000 --- a/pyasic/miners/etc/innosilicon/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .cgminer import * diff --git a/pyasic/miners/ckb/goldshell/__init__.py b/pyasic/miners/goldshell/__init__.py similarity index 100% rename from pyasic/miners/ckb/goldshell/__init__.py rename to pyasic/miners/goldshell/__init__.py diff --git a/pyasic/miners/ckb/goldshell/bfgminer/CKX/CK5.py b/pyasic/miners/goldshell/bfgminer/X5/CK5.py similarity index 94% rename from pyasic/miners/ckb/goldshell/bfgminer/CKX/CK5.py rename to pyasic/miners/goldshell/bfgminer/X5/CK5.py index 1b76a276..065174bf 100644 --- a/pyasic/miners/ckb/goldshell/bfgminer/CKX/CK5.py +++ b/pyasic/miners/goldshell/bfgminer/X5/CK5.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from pyasic.miners.backends import BFGMinerGoldshell -from pyasic.miners.ckb._types import CK5 # noqa - Ignore access to _module +from pyasic.miners.types import CK5 class BFGMinerCK5(BFGMinerGoldshell, CK5): diff --git a/pyasic/miners/hns/goldshell/bfgminer/HSX/HS5.py b/pyasic/miners/goldshell/bfgminer/X5/HS5.py similarity index 94% rename from pyasic/miners/hns/goldshell/bfgminer/HSX/HS5.py rename to pyasic/miners/goldshell/bfgminer/X5/HS5.py index d5e66217..7303f749 100644 --- a/pyasic/miners/hns/goldshell/bfgminer/HSX/HS5.py +++ b/pyasic/miners/goldshell/bfgminer/X5/HS5.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from pyasic.miners.backends import BFGMinerGoldshell -from pyasic.miners.hns._types import HS5 # noqa - Ignore access to _module +from pyasic.miners.types import HS5 class BFGMinerHS5(BFGMinerGoldshell, HS5): diff --git a/pyasic/miners/kda/goldshell/bfgminer/KDX/KD5.py b/pyasic/miners/goldshell/bfgminer/X5/KD5.py similarity index 94% rename from pyasic/miners/kda/goldshell/bfgminer/KDX/KD5.py rename to pyasic/miners/goldshell/bfgminer/X5/KD5.py index 1c9df1ce..215551b8 100644 --- a/pyasic/miners/kda/goldshell/bfgminer/KDX/KD5.py +++ b/pyasic/miners/goldshell/bfgminer/X5/KD5.py @@ -14,7 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from pyasic.miners.backends import BFGMinerGoldshell -from pyasic.miners.kda._types import KD5 # noqa - Ignore access to _module +from pyasic.miners.types import KD5 class BFGMinerKD5(BFGMinerGoldshell, KD5): diff --git a/pyasic/miners/ckb/goldshell/bfgminer/CKX/__init__.py b/pyasic/miners/goldshell/bfgminer/X5/__init__.py similarity index 95% rename from pyasic/miners/ckb/goldshell/bfgminer/CKX/__init__.py rename to pyasic/miners/goldshell/bfgminer/X5/__init__.py index 1c09abf1..3783311b 100644 --- a/pyasic/miners/ckb/goldshell/bfgminer/CKX/__init__.py +++ b/pyasic/miners/goldshell/bfgminer/X5/__init__.py @@ -14,3 +14,5 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from .CK5 import BFGMinerCK5 +from .HS5 import BFGMinerHS5 +from .KD5 import BFGMinerKD5 diff --git a/pyasic/miners/kda/goldshell/bfgminer/KDX/KDMax.py b/pyasic/miners/goldshell/bfgminer/XMax/KDMax.py similarity index 88% rename from pyasic/miners/kda/goldshell/bfgminer/KDX/KDMax.py rename to pyasic/miners/goldshell/bfgminer/XMax/KDMax.py index d0bd4097..553d01da 100644 --- a/pyasic/miners/kda/goldshell/bfgminer/KDX/KDMax.py +++ b/pyasic/miners/goldshell/bfgminer/XMax/KDMax.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from pyasic.miners.backends import BFGMinerGoldshell # noqa - Ignore access to _module -from pyasic.miners.kda._types import KDMax # noqa - Ignore access to _module +from pyasic.miners.backends import BFGMinerGoldshell +from pyasic.miners.types import KDMax class BFGMinerKDMax(BFGMinerGoldshell, KDMax): diff --git a/pyasic/miners/kda/goldshell/bfgminer/KDX/__init__.py b/pyasic/miners/goldshell/bfgminer/XMax/__init__.py similarity index 97% rename from pyasic/miners/kda/goldshell/bfgminer/KDX/__init__.py rename to pyasic/miners/goldshell/bfgminer/XMax/__init__.py index 6b445d19..1ad0de77 100644 --- a/pyasic/miners/kda/goldshell/bfgminer/KDX/__init__.py +++ b/pyasic/miners/goldshell/bfgminer/XMax/__init__.py @@ -13,5 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .KD5 import BFGMinerKD5 from .KDMax import BFGMinerKDMax diff --git a/pyasic/miners/dcr/_types/antminer/__init__.py b/pyasic/miners/goldshell/bfgminer/__init__.py similarity index 98% rename from pyasic/miners/dcr/_types/antminer/__init__.py rename to pyasic/miners/goldshell/bfgminer/__init__.py index 9e820153..2890f5d0 100644 --- a/pyasic/miners/dcr/_types/antminer/__init__.py +++ b/pyasic/miners/goldshell/bfgminer/__init__.py @@ -14,3 +14,4 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from .X5 import * +from .XMax import * diff --git a/pyasic/miners/hns/__init__.py b/pyasic/miners/hns/__init__.py deleted file mode 100644 index 3eb794c3..00000000 --- a/pyasic/miners/hns/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * -from .goldshell import * diff --git a/pyasic/miners/hns/_types/__init__.py b/pyasic/miners/hns/_types/__init__.py deleted file mode 100644 index 3eb794c3..00000000 --- a/pyasic/miners/hns/_types/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * -from .goldshell import * diff --git a/pyasic/miners/hns/_types/antminer/__init__.py b/pyasic/miners/hns/_types/antminer/__init__.py deleted file mode 100644 index 647fb882..00000000 --- a/pyasic/miners/hns/_types/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * diff --git a/pyasic/miners/hns/_types/goldshell/__init__.py b/pyasic/miners/hns/_types/goldshell/__init__.py deleted file mode 100644 index e9e16715..00000000 --- a/pyasic/miners/hns/_types/goldshell/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .HS5 import HS5 diff --git a/pyasic/miners/hns/antminer/__init__.py b/pyasic/miners/hns/antminer/__init__.py deleted file mode 100644 index a21b2ce9..00000000 --- a/pyasic/miners/hns/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .bmminer import * diff --git a/pyasic/miners/hns/antminer/bmminer/__init__.py b/pyasic/miners/hns/antminer/bmminer/__init__.py deleted file mode 100644 index 647fb882..00000000 --- a/pyasic/miners/hns/antminer/bmminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * diff --git a/pyasic/miners/hns/goldshell/__init__.py b/pyasic/miners/hns/goldshell/__init__.py deleted file mode 100644 index 75327f3a..00000000 --- a/pyasic/miners/hns/goldshell/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .bfgminer import * diff --git a/pyasic/miners/hns/goldshell/bfgminer/HSX/__init__.py b/pyasic/miners/hns/goldshell/bfgminer/HSX/__init__.py deleted file mode 100644 index fcf040a8..00000000 --- a/pyasic/miners/hns/goldshell/bfgminer/HSX/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .HS5 import BFGMinerHS5 diff --git a/pyasic/miners/hns/goldshell/bfgminer/__init__.py b/pyasic/miners/hns/goldshell/bfgminer/__init__.py deleted file mode 100644 index ec299280..00000000 --- a/pyasic/miners/hns/goldshell/bfgminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .HSX import * diff --git a/pyasic/miners/btc/innosilicon/__init__.py b/pyasic/miners/innosilicon/__init__.py similarity index 100% rename from pyasic/miners/btc/innosilicon/__init__.py rename to pyasic/miners/innosilicon/__init__.py diff --git a/pyasic/miners/etc/innosilicon/cgminer/A10X/A10X.py b/pyasic/miners/innosilicon/cgminer/A10X/A10X.py similarity index 99% rename from pyasic/miners/etc/innosilicon/cgminer/A10X/A10X.py rename to pyasic/miners/innosilicon/cgminer/A10X/A10X.py index 4ec8065f..c4d378a0 100644 --- a/pyasic/miners/etc/innosilicon/cgminer/A10X/A10X.py +++ b/pyasic/miners/innosilicon/cgminer/A10X/A10X.py @@ -21,7 +21,7 @@ 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 -from pyasic.miners.etc._types import A10X # noqa - Ignore access to _module +from pyasic.miners.types import A10X from pyasic.web.inno import InnosiliconWebAPI diff --git a/pyasic/miners/etc/innosilicon/cgminer/A10X/__init__.py b/pyasic/miners/innosilicon/cgminer/A10X/__init__.py similarity index 100% rename from pyasic/miners/etc/innosilicon/cgminer/A10X/__init__.py rename to pyasic/miners/innosilicon/cgminer/A10X/__init__.py diff --git a/pyasic/miners/btc/innosilicon/cgminer/T3X/T3H_Plus.py b/pyasic/miners/innosilicon/cgminer/T3X/T3H.py similarity index 98% rename from pyasic/miners/btc/innosilicon/cgminer/T3X/T3H_Plus.py rename to pyasic/miners/innosilicon/cgminer/T3X/T3H.py index 6acb1f67..0363b2dd 100644 --- a/pyasic/miners/btc/innosilicon/cgminer/T3X/T3H_Plus.py +++ b/pyasic/miners/innosilicon/cgminer/T3X/T3H.py @@ -21,13 +21,11 @@ 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 -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - InnosiliconT3HPlus, -) +from pyasic.miners.types import T3HPlus from pyasic.web.inno import InnosiliconWebAPI -class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus): +class CGMinerT3HPlus(CGMiner, T3HPlus): def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: super().__init__(ip, api_ver=api_ver) self.ip = ip diff --git a/pyasic/miners/innosilicon/cgminer/T3X/__init__.py b/pyasic/miners/innosilicon/cgminer/T3X/__init__.py new file mode 100644 index 00000000..f2a2eb8b --- /dev/null +++ b/pyasic/miners/innosilicon/cgminer/T3X/__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 .T3H import CGMinerT3HPlus diff --git a/pyasic/miners/etc/innosilicon/cgminer/__init__.py b/pyasic/miners/innosilicon/cgminer/__init__.py similarity index 98% rename from pyasic/miners/etc/innosilicon/cgminer/__init__.py rename to pyasic/miners/innosilicon/cgminer/__init__.py index 10558f91..9f15aa67 100644 --- a/pyasic/miners/etc/innosilicon/cgminer/__init__.py +++ b/pyasic/miners/innosilicon/cgminer/__init__.py @@ -15,3 +15,4 @@ # ------------------------------------------------------------------------------ from .A10X import * +from .T3X import * diff --git a/pyasic/miners/kda/__init__.py b/pyasic/miners/kda/__init__.py deleted file mode 100644 index d6d7eef1..00000000 --- a/pyasic/miners/kda/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .goldshell import * diff --git a/pyasic/miners/kda/_types/__init__.py b/pyasic/miners/kda/_types/__init__.py deleted file mode 100644 index d6d7eef1..00000000 --- a/pyasic/miners/kda/_types/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .goldshell import * diff --git a/pyasic/miners/kda/goldshell/__init__.py b/pyasic/miners/kda/goldshell/__init__.py deleted file mode 100644 index 75327f3a..00000000 --- a/pyasic/miners/kda/goldshell/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .bfgminer import * diff --git a/pyasic/miners/kda/goldshell/bfgminer/__init__.py b/pyasic/miners/kda/goldshell/bfgminer/__init__.py deleted file mode 100644 index 5902568b..00000000 --- a/pyasic/miners/kda/goldshell/bfgminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .KDX import * diff --git a/pyasic/miners/ltc/__init__.py b/pyasic/miners/ltc/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/ltc/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/ltc/_types/__init__.py b/pyasic/miners/ltc/_types/__init__.py deleted file mode 100644 index 71d6224e..00000000 --- a/pyasic/miners/ltc/_types/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .antminer import * diff --git a/pyasic/miners/ltc/_types/antminer/X3/__init__.py b/pyasic/miners/ltc/_types/antminer/X3/__init__.py deleted file mode 100644 index ebb8b457..00000000 --- a/pyasic/miners/ltc/_types/antminer/X3/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .L3_Plus import L3Plus diff --git a/pyasic/miners/ltc/_types/antminer/__init__.py b/pyasic/miners/ltc/_types/antminer/__init__.py deleted file mode 100644 index 13b56661..00000000 --- a/pyasic/miners/ltc/_types/antminer/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * -from .X7 import * diff --git a/pyasic/miners/ltc/antminer/__init__.py b/pyasic/miners/ltc/antminer/__init__.py deleted file mode 100644 index 4875fd33..00000000 --- a/pyasic/miners/ltc/antminer/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .bmminer import * -from .vnish import * diff --git a/pyasic/miners/ltc/antminer/bmminer/X3/__init__.py b/pyasic/miners/ltc/antminer/bmminer/X3/__init__.py deleted file mode 100644 index a147d34c..00000000 --- a/pyasic/miners/ltc/antminer/bmminer/X3/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .L3_Plus import BMMinerL3Plus diff --git a/pyasic/miners/ltc/antminer/bmminer/__init__.py b/pyasic/miners/ltc/antminer/bmminer/__init__.py deleted file mode 100644 index 13b56661..00000000 --- a/pyasic/miners/ltc/antminer/bmminer/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * -from .X7 import * diff --git a/pyasic/miners/ltc/antminer/vnish/X3/__init__.py b/pyasic/miners/ltc/antminer/vnish/X3/__init__.py deleted file mode 100644 index 97a2c81b..00000000 --- a/pyasic/miners/ltc/antminer/vnish/X3/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ - -from .L3_Plus import VnishL3Plus diff --git a/pyasic/miners/ltc/antminer/vnish/__init__.py b/pyasic/miners/ltc/antminer/vnish/__init__.py deleted file mode 100644 index 647fb882..00000000 --- a/pyasic/miners/ltc/antminer/vnish/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X3 import * diff --git a/pyasic/miners/miner_factory.py b/pyasic/miners/miner_factory.py index 51403282..80772e4f 100644 --- a/pyasic/miners/miner_factory.py +++ b/pyasic/miners/miner_factory.py @@ -25,6 +25,8 @@ from typing import Callable, List, Optional, Tuple, Union import aiohttp from pyasic.logger import logger +from pyasic.miners.antminer import * +from pyasic.miners.avalonminer import * from pyasic.miners.backends import ( BFGMiner, BMMiner, @@ -36,16 +38,10 @@ from pyasic.miners.backends import ( VNish, ) from pyasic.miners.base import AnyMiner -from pyasic.miners.btc import * -from pyasic.miners.ckb import * -from pyasic.miners.dcr import * -from pyasic.miners.dsh import * -from pyasic.miners.etc import * -from pyasic.miners.hns import * -from pyasic.miners.kda import * -from pyasic.miners.ltc import * +from pyasic.miners.goldshell import * +from pyasic.miners.innosilicon import * from pyasic.miners.unknown import UnknownMiner -from pyasic.miners.zec import * +from pyasic.miners.whatsminer import * TIMEOUT = 20 RETRIES = 3 @@ -295,7 +291,7 @@ MINER_CLASSES = { }, MinerTypes.INNOSILICON: { None: CGMiner, - "T3H+": CGMinerInnosiliconT3HPlus, + "T3H+": CGMinerT3HPlus, "A10X": CGMinerA10X, }, MinerTypes.GOLDSHELL: { @@ -362,10 +358,22 @@ async def concurrent_get_first_result(tasks: list, verification_func: Callable): class MinerFactory: + def __init__(self): + self.cache = {} + + def clear_cached_miners(self): + self.cache = {} + async def get_multiple_miners(self, ips: List[str], limit: int = 200): - tasks = [] results = [] + async for miner in self.get_miner_generator(ips, limit): + results.append(miner) + + return results + + async def get_miner_generator(self, ips: list, limit: int = 200): + tasks = [] semaphore = asyncio.Semaphore(limit) for ip in ips: @@ -376,13 +384,14 @@ class MinerFactory: try: result = await task if result is not None: - results.append(result) + yield result finally: semaphore.release() - return results - async def get_miner(self, ip: str): + ip = str(ip) + if ip in self.cache: + return self.cache[ip] miner_type = None for _ in range(RETRIES): task = asyncio.create_task(self._get_miner_type(ip)) @@ -420,9 +429,12 @@ class MinerFactory: except asyncio.TimeoutError: task.cancel() - return self._select_miner_from_classes( + miner = self._select_miner_from_classes( ip, miner_type=miner_type, miner_model=miner_model ) + if miner is not None and not isinstance(miner, UnknownMiner): + self.cache[ip] = miner + return miner async def _get_miner_type(self, ip: str): tasks = [ diff --git a/pyasic/miners/btc/_types/__init__.py b/pyasic/miners/types/__init__.py similarity index 98% rename from pyasic/miners/btc/_types/__init__.py rename to pyasic/miners/types/__init__.py index 41f2df94..a35a8fa1 100644 --- a/pyasic/miners/btc/_types/__init__.py +++ b/pyasic/miners/types/__init__.py @@ -16,5 +16,6 @@ from .antminer import * from .avalonminer import * +from .goldshell import * from .innosilicon import * from .whatsminer import * diff --git a/pyasic/miners/zec/_types/antminer/X15/Z15.py b/pyasic/miners/types/antminer/X15/Z15.py similarity index 100% rename from pyasic/miners/zec/_types/antminer/X15/Z15.py rename to pyasic/miners/types/antminer/X15/Z15.py diff --git a/pyasic/miners/zec/_types/antminer/X15/__init__.py b/pyasic/miners/types/antminer/X15/__init__.py similarity index 100% rename from pyasic/miners/zec/_types/antminer/X15/__init__.py rename to pyasic/miners/types/antminer/X15/__init__.py diff --git a/pyasic/miners/btc/_types/antminer/X17/S17_Pro.py b/pyasic/miners/types/antminer/X17/S17.py similarity index 65% rename from pyasic/miners/btc/_types/antminer/X17/S17_Pro.py rename to pyasic/miners/types/antminer/X17/S17.py index f262573d..fcbb83f3 100644 --- a/pyasic/miners/btc/_types/antminer/X17/S17_Pro.py +++ b/pyasic/miners/types/antminer/X17/S17.py @@ -17,6 +17,23 @@ from pyasic.miners.makes import AntMiner +class S17(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S17" + self.nominal_chips = 48 + self.fan_count = 4 + + +class S17Plus(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.model = "S17+" + self.nominal_chips = 65 + self.fan_count = 4 + + class S17Pro(AntMiner): # noqa - ignore ABC method implementation def __init__(self, ip: str, api_ver: str = "0.0.0"): super().__init__(ip, api_ver) @@ -24,3 +41,12 @@ class S17Pro(AntMiner): # noqa - ignore ABC method implementation self.model = "S17 Pro" self.nominal_chips = 48 self.fan_count = 4 + + +class S17e(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S17e" + self.nominal_chips = 135 + self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/S19j.py b/pyasic/miners/types/antminer/X17/T17.py similarity index 74% rename from pyasic/miners/btc/_types/antminer/X19/S19j.py rename to pyasic/miners/types/antminer/X17/T17.py index 847f6bf1..6ac7c414 100644 --- a/pyasic/miners/btc/_types/antminer/X19/S19j.py +++ b/pyasic/miners/types/antminer/X17/T17.py @@ -17,19 +17,28 @@ from pyasic.miners.makes import AntMiner -class S19j(AntMiner): # noqa - ignore ABC method implementation +class T17(AntMiner): # noqa - ignore ABC method implementation def __init__(self, ip: str, api_ver: str = "0.0.0"): super().__init__(ip, api_ver) self.ip = ip - self.model = "S19j" - self.nominal_chips = 114 + self.model = "T17" + self.nominal_chips = 30 self.fan_count = 4 -class S19jNoPIC(AntMiner): # noqa - ignore ABC method implementation +class T17Plus(AntMiner): # noqa - ignore ABC method implementation def __init__(self, ip: str, api_ver: str = "0.0.0"): super().__init__(ip, api_ver) self.ip = ip - self.model = "S19j No PIC" - self.nominal_chips = 88 + self.model = "T17+" + self.nominal_chips = 44 + self.fan_count = 4 + + +class T17e(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "T17e" + self.nominal_chips = 78 self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/innosilicon/T3X/__init__.py b/pyasic/miners/types/antminer/X17/__init__.py similarity index 93% rename from pyasic/miners/btc/_types/innosilicon/T3X/__init__.py rename to pyasic/miners/types/antminer/X17/__init__.py index 0f2fba5f..e21b2111 100644 --- a/pyasic/miners/btc/_types/innosilicon/T3X/__init__.py +++ b/pyasic/miners/types/antminer/X17/__init__.py @@ -14,4 +14,5 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from .T3H_Plus import InnosiliconT3HPlus +from .S17 import S17, S17e, S17Plus, S17Pro +from .T17 import T17, T17e, T17Plus diff --git a/pyasic/miners/types/antminer/X19/S19.py b/pyasic/miners/types/antminer/X19/S19.py new file mode 100644 index 00000000..b3f59bdb --- /dev/null +++ b/pyasic/miners/types/antminer/X19/S19.py @@ -0,0 +1,107 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from pyasic.miners.makes import AntMiner + + +class S19(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19" + self.nominal_chips = 76 + self.fan_count = 4 + + +class S19Pro(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19 Pro" + self.nominal_chips = 114 + self.fan_count = 4 + + +class S19ProPlus(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19 Pro+" + self.nominal_chips = 120 + self.fan_count = 4 + + +class S19XP(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19 XP" + self.nominal_chips = 110 + self.fan_count = 4 + + +class S19a(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19a" + self.nominal_chips = 72 + self.fan_count = 4 + + +class S19aPro(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19a Pro" + self.nominal_chips = 100 + self.fan_count = 4 + + +class S19j(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19j" + self.nominal_chips = 114 + self.fan_count = 4 + + +class S19jNoPIC(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19j No PIC" + self.nominal_chips = 88 + self.fan_count = 4 + + +class S19jPro(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19j Pro" + self.nominal_chips = 126 + self.fan_count = 4 + + +class S19L(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S19L" + self.nominal_chips = 76 + self.fan_count = 4 diff --git a/pyasic/miners/btc/_types/antminer/X19/T19.py b/pyasic/miners/types/antminer/X19/T19.py similarity index 100% rename from pyasic/miners/btc/_types/antminer/X19/T19.py rename to pyasic/miners/types/antminer/X19/T19.py diff --git a/pyasic/miners/types/antminer/X19/__init__.py b/pyasic/miners/types/antminer/X19/__init__.py new file mode 100644 index 00000000..63929159 --- /dev/null +++ b/pyasic/miners/types/antminer/X19/__init__.py @@ -0,0 +1,29 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from .S19 import ( + S19, + S19L, + S19XP, + S19a, + S19aPro, + S19j, + S19jNoPIC, + S19jPro, + S19Pro, + S19ProPlus, +) +from .T19 import T19 diff --git a/pyasic/miners/dsh/_types/antminer/X3/D3.py b/pyasic/miners/types/antminer/X3/D3.py similarity index 100% rename from pyasic/miners/dsh/_types/antminer/X3/D3.py rename to pyasic/miners/types/antminer/X3/D3.py diff --git a/pyasic/miners/hns/_types/antminer/X3/HS3.py b/pyasic/miners/types/antminer/X3/HS3.py similarity index 100% rename from pyasic/miners/hns/_types/antminer/X3/HS3.py rename to pyasic/miners/types/antminer/X3/HS3.py diff --git a/pyasic/miners/ltc/_types/antminer/X3/L3_Plus.py b/pyasic/miners/types/antminer/X3/L3.py similarity index 100% rename from pyasic/miners/ltc/_types/antminer/X3/L3_Plus.py rename to pyasic/miners/types/antminer/X3/L3.py diff --git a/pyasic/miners/hns/_types/antminer/X3/__init__.py b/pyasic/miners/types/antminer/X3/__init__.py similarity index 96% rename from pyasic/miners/hns/_types/antminer/X3/__init__.py rename to pyasic/miners/types/antminer/X3/__init__.py index 5ca92b31..74040827 100644 --- a/pyasic/miners/hns/_types/antminer/X3/__init__.py +++ b/pyasic/miners/types/antminer/X3/__init__.py @@ -13,4 +13,6 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ +from .D3 import D3 from .HS3 import HS3 +from .L3 import L3Plus diff --git a/pyasic/miners/dcr/_types/antminer/X5/DR5.py b/pyasic/miners/types/antminer/X5/DR5.py similarity index 100% rename from pyasic/miners/dcr/_types/antminer/X5/DR5.py rename to pyasic/miners/types/antminer/X5/DR5.py diff --git a/pyasic/miners/dcr/_types/antminer/X5/__init__.py b/pyasic/miners/types/antminer/X5/__init__.py similarity index 100% rename from pyasic/miners/dcr/_types/antminer/X5/__init__.py rename to pyasic/miners/types/antminer/X5/__init__.py diff --git a/pyasic/miners/ltc/_types/antminer/X7/L7.py b/pyasic/miners/types/antminer/X7/L7.py similarity index 100% rename from pyasic/miners/ltc/_types/antminer/X7/L7.py rename to pyasic/miners/types/antminer/X7/L7.py diff --git a/pyasic/miners/ltc/_types/antminer/X7/__init__.py b/pyasic/miners/types/antminer/X7/__init__.py similarity index 100% rename from pyasic/miners/ltc/_types/antminer/X7/__init__.py rename to pyasic/miners/types/antminer/X7/__init__.py diff --git a/pyasic/miners/etc/_types/antminer/X9/E9_Pro.py b/pyasic/miners/types/antminer/X9/E9.py similarity index 100% rename from pyasic/miners/etc/_types/antminer/X9/E9_Pro.py rename to pyasic/miners/types/antminer/X9/E9.py diff --git a/pyasic/miners/btc/_types/antminer/X9/S9i.py b/pyasic/miners/types/antminer/X9/S9.py similarity index 74% rename from pyasic/miners/btc/_types/antminer/X9/S9i.py rename to pyasic/miners/types/antminer/X9/S9.py index 0e55cea2..8d0eaf15 100644 --- a/pyasic/miners/btc/_types/antminer/X9/S9i.py +++ b/pyasic/miners/types/antminer/X9/S9.py @@ -17,6 +17,15 @@ from pyasic.miners.makes import AntMiner +class S9(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S9" + self.nominal_chips = 63 + self.fan_count = 2 + + class S9i(AntMiner): # noqa - ignore ABC method implementation def __init__(self, ip: str, api_ver: str = "0.0.0"): super().__init__(ip, api_ver) @@ -24,3 +33,12 @@ class S9i(AntMiner): # noqa - ignore ABC method implementation self.model = "S9i" self.nominal_chips = 63 self.fan_count = 2 + + +class S9j(AntMiner): # noqa - ignore ABC method implementation + def __init__(self, ip: str, api_ver: str = "0.0.0"): + super().__init__(ip, api_ver) + self.ip = ip + self.model = "S9j" + self.nominal_chips = 63 + self.fan_count = 2 diff --git a/pyasic/miners/btc/_types/antminer/X9/T9.py b/pyasic/miners/types/antminer/X9/T9.py similarity index 100% rename from pyasic/miners/btc/_types/antminer/X9/T9.py rename to pyasic/miners/types/antminer/X9/T9.py diff --git a/pyasic/miners/btc/_types/antminer/X9/__init__.py b/pyasic/miners/types/antminer/X9/__init__.py similarity index 95% rename from pyasic/miners/btc/_types/antminer/X9/__init__.py rename to pyasic/miners/types/antminer/X9/__init__.py index 2e8359f0..2aa5cc5e 100644 --- a/pyasic/miners/btc/_types/antminer/X9/__init__.py +++ b/pyasic/miners/types/antminer/X9/__init__.py @@ -14,7 +14,6 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from .S9 import S9 -from .S9i import S9i -from .S9j import S9j +from .E9 import E9Pro +from .S9 import S9, S9i, S9j from .T9 import T9 diff --git a/pyasic/miners/btc/antminer/cgminer/__init__.py b/pyasic/miners/types/antminer/__init__.py similarity index 94% rename from pyasic/miners/btc/antminer/cgminer/__init__.py rename to pyasic/miners/types/antminer/__init__.py index 2d43e0e4..67428e10 100644 --- a/pyasic/miners/btc/antminer/cgminer/__init__.py +++ b/pyasic/miners/types/antminer/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ - +from .X3 import * +from .X5 import * +from .X7 import * from .X9 import * +from .X15 import * from .X17 import * from .X19 import * diff --git a/pyasic/miners/btc/_types/avalonminer/A10X/A1026.py b/pyasic/miners/types/avalonminer/A10X/A1026.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A10X/A1026.py rename to pyasic/miners/types/avalonminer/A10X/A1026.py diff --git a/pyasic/miners/btc/_types/avalonminer/A10X/A1047.py b/pyasic/miners/types/avalonminer/A10X/A1047.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A10X/A1047.py rename to pyasic/miners/types/avalonminer/A10X/A1047.py diff --git a/pyasic/miners/btc/_types/avalonminer/A10X/A1066.py b/pyasic/miners/types/avalonminer/A10X/A1066.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A10X/A1066.py rename to pyasic/miners/types/avalonminer/A10X/A1066.py diff --git a/pyasic/miners/btc/_types/avalonminer/A10X/__init__.py b/pyasic/miners/types/avalonminer/A10X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A10X/__init__.py rename to pyasic/miners/types/avalonminer/A10X/__init__.py diff --git a/pyasic/miners/btc/_types/avalonminer/A11X/A1166.py b/pyasic/miners/types/avalonminer/A11X/A1166.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A11X/A1166.py rename to pyasic/miners/types/avalonminer/A11X/A1166.py diff --git a/pyasic/miners/btc/_types/avalonminer/A11X/__init__.py b/pyasic/miners/types/avalonminer/A11X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A11X/__init__.py rename to pyasic/miners/types/avalonminer/A11X/__init__.py diff --git a/pyasic/miners/btc/_types/avalonminer/A12X/A1246.py b/pyasic/miners/types/avalonminer/A12X/A1246.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A12X/A1246.py rename to pyasic/miners/types/avalonminer/A12X/A1246.py diff --git a/pyasic/miners/btc/_types/avalonminer/A12X/__init__.py b/pyasic/miners/types/avalonminer/A12X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A12X/__init__.py rename to pyasic/miners/types/avalonminer/A12X/__init__.py diff --git a/pyasic/miners/btc/_types/avalonminer/A7X/A721.py b/pyasic/miners/types/avalonminer/A7X/A721.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A7X/A721.py rename to pyasic/miners/types/avalonminer/A7X/A721.py diff --git a/pyasic/miners/btc/_types/avalonminer/A7X/A741.py b/pyasic/miners/types/avalonminer/A7X/A741.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A7X/A741.py rename to pyasic/miners/types/avalonminer/A7X/A741.py diff --git a/pyasic/miners/btc/_types/avalonminer/A7X/A761.py b/pyasic/miners/types/avalonminer/A7X/A761.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A7X/A761.py rename to pyasic/miners/types/avalonminer/A7X/A761.py diff --git a/pyasic/miners/btc/_types/avalonminer/A7X/__init__.py b/pyasic/miners/types/avalonminer/A7X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A7X/__init__.py rename to pyasic/miners/types/avalonminer/A7X/__init__.py diff --git a/pyasic/miners/btc/_types/avalonminer/A8X/A821.py b/pyasic/miners/types/avalonminer/A8X/A821.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A8X/A821.py rename to pyasic/miners/types/avalonminer/A8X/A821.py diff --git a/pyasic/miners/btc/_types/avalonminer/A8X/A841.py b/pyasic/miners/types/avalonminer/A8X/A841.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A8X/A841.py rename to pyasic/miners/types/avalonminer/A8X/A841.py diff --git a/pyasic/miners/btc/_types/avalonminer/A8X/A851.py b/pyasic/miners/types/avalonminer/A8X/A851.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A8X/A851.py rename to pyasic/miners/types/avalonminer/A8X/A851.py diff --git a/pyasic/miners/btc/_types/avalonminer/A8X/__init__.py b/pyasic/miners/types/avalonminer/A8X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A8X/__init__.py rename to pyasic/miners/types/avalonminer/A8X/__init__.py diff --git a/pyasic/miners/btc/_types/avalonminer/A9X/A921.py b/pyasic/miners/types/avalonminer/A9X/A921.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A9X/A921.py rename to pyasic/miners/types/avalonminer/A9X/A921.py diff --git a/pyasic/miners/btc/_types/avalonminer/A9X/__init__.py b/pyasic/miners/types/avalonminer/A9X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/avalonminer/A9X/__init__.py rename to pyasic/miners/types/avalonminer/A9X/__init__.py diff --git a/pyasic/miners/btc/avalonminer/cgminer/__init__.py b/pyasic/miners/types/avalonminer/__init__.py similarity index 100% rename from pyasic/miners/btc/avalonminer/cgminer/__init__.py rename to pyasic/miners/types/avalonminer/__init__.py diff --git a/pyasic/miners/ckb/_types/goldshell/CK5.py b/pyasic/miners/types/goldshell/X5/CK5.py similarity index 100% rename from pyasic/miners/ckb/_types/goldshell/CK5.py rename to pyasic/miners/types/goldshell/X5/CK5.py diff --git a/pyasic/miners/hns/_types/goldshell/HS5.py b/pyasic/miners/types/goldshell/X5/HS5.py similarity index 100% rename from pyasic/miners/hns/_types/goldshell/HS5.py rename to pyasic/miners/types/goldshell/X5/HS5.py diff --git a/pyasic/miners/kda/_types/goldshell/KD5.py b/pyasic/miners/types/goldshell/X5/KD5.py similarity index 100% rename from pyasic/miners/kda/_types/goldshell/KD5.py rename to pyasic/miners/types/goldshell/X5/KD5.py diff --git a/pyasic/miners/ckb/_types/goldshell/__init__.py b/pyasic/miners/types/goldshell/X5/__init__.py similarity index 96% rename from pyasic/miners/ckb/_types/goldshell/__init__.py rename to pyasic/miners/types/goldshell/X5/__init__.py index 54fb009f..09a7c931 100644 --- a/pyasic/miners/ckb/_types/goldshell/__init__.py +++ b/pyasic/miners/types/goldshell/X5/__init__.py @@ -14,3 +14,5 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from .CK5 import CK5 +from .HS5 import HS5 +from .KD5 import KD5 diff --git a/pyasic/miners/kda/_types/goldshell/KDMax.py b/pyasic/miners/types/goldshell/XMax/KDMax.py similarity index 100% rename from pyasic/miners/kda/_types/goldshell/KDMax.py rename to pyasic/miners/types/goldshell/XMax/KDMax.py diff --git a/pyasic/miners/kda/_types/goldshell/__init__.py b/pyasic/miners/types/goldshell/XMax/__init__.py similarity index 98% rename from pyasic/miners/kda/_types/goldshell/__init__.py rename to pyasic/miners/types/goldshell/XMax/__init__.py index 7d6e4589..5c10f6bd 100644 --- a/pyasic/miners/kda/_types/goldshell/__init__.py +++ b/pyasic/miners/types/goldshell/XMax/__init__.py @@ -13,5 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .KD5 import KD5 from .KDMax import KDMax diff --git a/pyasic/miners/dcr/antminer/cgminer/__init__.py b/pyasic/miners/types/goldshell/__init__.py similarity index 98% rename from pyasic/miners/dcr/antminer/cgminer/__init__.py rename to pyasic/miners/types/goldshell/__init__.py index 9e820153..2890f5d0 100644 --- a/pyasic/miners/dcr/antminer/cgminer/__init__.py +++ b/pyasic/miners/types/goldshell/__init__.py @@ -14,3 +14,4 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from .X5 import * +from .XMax import * diff --git a/pyasic/miners/etc/_types/innosilicon/A10X/A10X.py b/pyasic/miners/types/innosilicon/A10X/A10X.py similarity index 92% rename from pyasic/miners/etc/_types/innosilicon/A10X/A10X.py rename to pyasic/miners/types/innosilicon/A10X/A10X.py index 153e9adb..62e92817 100644 --- a/pyasic/miners/etc/_types/innosilicon/A10X/A10X.py +++ b/pyasic/miners/types/innosilicon/A10X/A10X.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ - from pyasic.miners.makes import InnosiliconMiner @@ -21,7 +20,3 @@ class A10X(InnosiliconMiner): # noqa - ignore ABC method implementation def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: super().__init__(ip, api_ver) self.ip = ip - self.model = "A10X" - self.nominal_chips = 9 - self.ideal_hashboards = 4 - self.fan_count = 4 diff --git a/pyasic/miners/etc/_types/innosilicon/__init__.py b/pyasic/miners/types/innosilicon/A10X/__init__.py similarity index 99% rename from pyasic/miners/etc/_types/innosilicon/__init__.py rename to pyasic/miners/types/innosilicon/A10X/__init__.py index 10558f91..9f9e1537 100644 --- a/pyasic/miners/etc/_types/innosilicon/__init__.py +++ b/pyasic/miners/types/innosilicon/A10X/__init__.py @@ -13,5 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ - from .A10X import * diff --git a/pyasic/miners/btc/_types/innosilicon/T3X/T3H_Plus.py b/pyasic/miners/types/innosilicon/T3X/T3H.py similarity index 94% rename from pyasic/miners/btc/_types/innosilicon/T3X/T3H_Plus.py rename to pyasic/miners/types/innosilicon/T3X/T3H.py index d98d9337..f9d6c004 100644 --- a/pyasic/miners/btc/_types/innosilicon/T3X/T3H_Plus.py +++ b/pyasic/miners/types/innosilicon/T3X/T3H.py @@ -17,7 +17,7 @@ from pyasic.miners.makes import InnosiliconMiner -class InnosiliconT3HPlus(InnosiliconMiner): # noqa - ignore ABC method implementation +class T3HPlus(InnosiliconMiner): # noqa - ignore ABC method implementation def __init__(self, ip: str, api_ver: str = "0.0.0") -> None: super().__init__(ip, api_ver) self.ip = ip diff --git a/pyasic/miners/etc/_types/innosilicon/A10X/__init__.py b/pyasic/miners/types/innosilicon/T3X/__init__.py similarity index 97% rename from pyasic/miners/etc/_types/innosilicon/A10X/__init__.py rename to pyasic/miners/types/innosilicon/T3X/__init__.py index 25510e24..b7e64c8b 100644 --- a/pyasic/miners/etc/_types/innosilicon/A10X/__init__.py +++ b/pyasic/miners/types/innosilicon/T3X/__init__.py @@ -14,4 +14,4 @@ # limitations under the License. - # ------------------------------------------------------------------------------ -from .A10X import A10X +from .T3H import T3HPlus diff --git a/pyasic/miners/btc/_types/innosilicon/__init__.py b/pyasic/miners/types/innosilicon/__init__.py similarity index 98% rename from pyasic/miners/btc/_types/innosilicon/__init__.py rename to pyasic/miners/types/innosilicon/__init__.py index f9332d03..9f15aa67 100644 --- a/pyasic/miners/btc/_types/innosilicon/__init__.py +++ b/pyasic/miners/types/innosilicon/__init__.py @@ -14,4 +14,5 @@ # limitations under the License. - # ------------------------------------------------------------------------------ +from .A10X import * from .T3X import * diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M20.py b/pyasic/miners/types/whatsminer/M2X/M20.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M20.py rename to pyasic/miners/types/whatsminer/M2X/M20.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M20S.py b/pyasic/miners/types/whatsminer/M2X/M20S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M20S.py rename to pyasic/miners/types/whatsminer/M2X/M20S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M20S_Plus.py b/pyasic/miners/types/whatsminer/M2X/M20S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M20S_Plus.py rename to pyasic/miners/types/whatsminer/M2X/M20S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M21.py b/pyasic/miners/types/whatsminer/M2X/M21.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M21.py rename to pyasic/miners/types/whatsminer/M2X/M21.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M21S.py b/pyasic/miners/types/whatsminer/M2X/M21S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M21S.py rename to pyasic/miners/types/whatsminer/M2X/M21S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M21S_Plus.py b/pyasic/miners/types/whatsminer/M2X/M21S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M21S_Plus.py rename to pyasic/miners/types/whatsminer/M2X/M21S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/M29.py b/pyasic/miners/types/whatsminer/M2X/M29.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/M29.py rename to pyasic/miners/types/whatsminer/M2X/M29.py diff --git a/pyasic/miners/btc/_types/whatsminer/M2X/__init__.py b/pyasic/miners/types/whatsminer/M2X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M2X/__init__.py rename to pyasic/miners/types/whatsminer/M2X/__init__.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M30.py b/pyasic/miners/types/whatsminer/M3X/M30.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M30.py rename to pyasic/miners/types/whatsminer/M3X/M30.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M30S.py b/pyasic/miners/types/whatsminer/M3X/M30S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M30S.py rename to pyasic/miners/types/whatsminer/M3X/M30S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus.py b/pyasic/miners/types/whatsminer/M3X/M30S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M30S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus_Plus.py b/pyasic/miners/types/whatsminer/M3X/M30S_Plus_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M30S_Plus_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M30S_Plus_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M31.py b/pyasic/miners/types/whatsminer/M3X/M31.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M31.py rename to pyasic/miners/types/whatsminer/M3X/M31.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M31H.py b/pyasic/miners/types/whatsminer/M3X/M31H.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M31H.py rename to pyasic/miners/types/whatsminer/M3X/M31H.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M31S.py b/pyasic/miners/types/whatsminer/M3X/M31S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M31S.py rename to pyasic/miners/types/whatsminer/M3X/M31S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M31SE.py b/pyasic/miners/types/whatsminer/M3X/M31SE.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M31SE.py rename to pyasic/miners/types/whatsminer/M3X/M31SE.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M31S_Plus.py b/pyasic/miners/types/whatsminer/M3X/M31S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M31S_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M31S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M32.py b/pyasic/miners/types/whatsminer/M3X/M32.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M32.py rename to pyasic/miners/types/whatsminer/M3X/M32.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M32S.py b/pyasic/miners/types/whatsminer/M3X/M32S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M32S.py rename to pyasic/miners/types/whatsminer/M3X/M32S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M33.py b/pyasic/miners/types/whatsminer/M3X/M33.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M33.py rename to pyasic/miners/types/whatsminer/M3X/M33.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M33S.py b/pyasic/miners/types/whatsminer/M3X/M33S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M33S.py rename to pyasic/miners/types/whatsminer/M3X/M33S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus.py b/pyasic/miners/types/whatsminer/M3X/M33S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M33S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus_Plus.py b/pyasic/miners/types/whatsminer/M3X/M33S_Plus_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M33S_Plus_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M33S_Plus_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M34S_Plus.py b/pyasic/miners/types/whatsminer/M3X/M34S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M34S_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M34S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M36S.py b/pyasic/miners/types/whatsminer/M3X/M36S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M36S.py rename to pyasic/miners/types/whatsminer/M3X/M36S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus.py b/pyasic/miners/types/whatsminer/M3X/M36S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M36S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus_Plus.py b/pyasic/miners/types/whatsminer/M3X/M36S_Plus_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M36S_Plus_Plus.py rename to pyasic/miners/types/whatsminer/M3X/M36S_Plus_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/M39.py b/pyasic/miners/types/whatsminer/M3X/M39.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/M39.py rename to pyasic/miners/types/whatsminer/M3X/M39.py diff --git a/pyasic/miners/btc/_types/whatsminer/M3X/__init__.py b/pyasic/miners/types/whatsminer/M3X/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M3X/__init__.py rename to pyasic/miners/types/whatsminer/M3X/__init__.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M50.py b/pyasic/miners/types/whatsminer/M5X/M50.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M50.py rename to pyasic/miners/types/whatsminer/M5X/M50.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M50S.py b/pyasic/miners/types/whatsminer/M5X/M50S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M50S.py rename to pyasic/miners/types/whatsminer/M5X/M50S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus.py b/pyasic/miners/types/whatsminer/M5X/M50S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus.py rename to pyasic/miners/types/whatsminer/M5X/M50S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus_Plus.py b/pyasic/miners/types/whatsminer/M5X/M50S_Plus_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M50S_Plus_Plus.py rename to pyasic/miners/types/whatsminer/M5X/M50S_Plus_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M53.py b/pyasic/miners/types/whatsminer/M5X/M53.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M53.py rename to pyasic/miners/types/whatsminer/M5X/M53.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M53S.py b/pyasic/miners/types/whatsminer/M5X/M53S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M53S.py rename to pyasic/miners/types/whatsminer/M5X/M53S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M53S_Plus.py b/pyasic/miners/types/whatsminer/M5X/M53S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M53S_Plus.py rename to pyasic/miners/types/whatsminer/M5X/M53S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M56.py b/pyasic/miners/types/whatsminer/M5X/M56.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M56.py rename to pyasic/miners/types/whatsminer/M5X/M56.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M56S.py b/pyasic/miners/types/whatsminer/M5X/M56S.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M56S.py rename to pyasic/miners/types/whatsminer/M5X/M56S.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M56S_Plus.py b/pyasic/miners/types/whatsminer/M5X/M56S_Plus.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M56S_Plus.py rename to pyasic/miners/types/whatsminer/M5X/M56S_Plus.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/M59.py b/pyasic/miners/types/whatsminer/M5X/M59.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/M5X/M59.py rename to pyasic/miners/types/whatsminer/M5X/M59.py diff --git a/pyasic/miners/btc/_types/whatsminer/M5X/__init__.py b/pyasic/miners/types/whatsminer/M5X/__init__.py similarity index 95% rename from pyasic/miners/btc/_types/whatsminer/M5X/__init__.py rename to pyasic/miners/types/whatsminer/M5X/__init__.py index b3d9fd4d..2ffb981a 100644 --- a/pyasic/miners/btc/_types/whatsminer/M5X/__init__.py +++ b/pyasic/miners/types/whatsminer/M5X/__init__.py @@ -39,7 +39,7 @@ from .M50S import ( M50SVJ30, ) from .M50S_Plus import M50SPlusVH30, M50SPlusVH40, M50SPlusVJ30 -from .M50S_Plus_Plus import M50SPlusPlusVK30, M50SPlusPlusVK20, M50SPlusPlusVK10 +from .M50S_Plus_Plus import M50SPlusPlusVK10, M50SPlusPlusVK20, M50SPlusPlusVK30 from .M53 import M53VH30 from .M53S import M53SVH30 from .M53S_Plus import M53SPlusVJ30 diff --git a/pyasic/miners/btc/_types/whatsminer/__init__.py b/pyasic/miners/types/whatsminer/__init__.py similarity index 100% rename from pyasic/miners/btc/_types/whatsminer/__init__.py rename to pyasic/miners/types/whatsminer/__init__.py diff --git a/pyasic/miners/btc/whatsminer/__init__.py b/pyasic/miners/whatsminer/__init__.py similarity index 100% rename from pyasic/miners/btc/whatsminer/__init__.py rename to pyasic/miners/whatsminer/__init__.py diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M20.py b/pyasic/miners/whatsminer/btminer/M2X/M20.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M20.py rename to pyasic/miners/whatsminer/btminer/M2X/M20.py index ad15b2f2..55663303 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M20.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M20.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import M20V10 # noqa - Ignore access to _module +from pyasic.miners.types import M20V10 class BTMinerM20V10(M2X, M20V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M20S.py b/pyasic/miners/whatsminer/btminer/M2X/M20S.py similarity index 92% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M20S.py rename to pyasic/miners/whatsminer/btminer/M2X/M20S.py index 47e8ec22..badf877a 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M20S.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M20S.py @@ -15,11 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M20SV10, - M20SV20, - M20SV30, -) +from pyasic.miners.types import M20SV10, M20SV20, M20SV30 class BTMinerM20SV10(M2X, M20SV10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M20S_Plus.py b/pyasic/miners/whatsminer/btminer/M2X/M20S_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M20S_Plus.py rename to pyasic/miners/whatsminer/btminer/M2X/M20S_Plus.py index 4606d2b4..b028f873 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M20S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M20S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import M20SPlusV30 # noqa - Ignore access to _module +from pyasic.miners.types import M20SPlusV30 class BTMinerM20SPlusV30(M2X, M20SPlusV30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M21.py b/pyasic/miners/whatsminer/btminer/M2X/M21.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M21.py rename to pyasic/miners/whatsminer/btminer/M2X/M21.py index 52d44afb..b7f9c1f1 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M21.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M21.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import M21V10 # noqa - Ignore access to _module +from pyasic.miners.types import M21V10 class BTMinerM21V10(M2X, M21V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M21S.py b/pyasic/miners/whatsminer/btminer/M2X/M21S.py similarity index 92% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M21S.py rename to pyasic/miners/whatsminer/btminer/M2X/M21S.py index 1d3fcb6d..7bffbdfd 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M21S.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M21S.py @@ -15,11 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M21SV20, - M21SV60, - M21SV70, -) +from pyasic.miners.types import M21SV20, M21SV60, M21SV70 class BTMinerM21SV20(M2X, M21SV20): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M21S_Plus.py b/pyasic/miners/whatsminer/btminer/M2X/M21S_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M21S_Plus.py rename to pyasic/miners/whatsminer/btminer/M2X/M21S_Plus.py index 0f8ad137..7f18af26 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M21S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M21S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import M21SPlusV20 # noqa - Ignore access to _module +from pyasic.miners.types import M21SPlusV20 class BTMinerM21SPlusV20(M2X, M21SPlusV20): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/M29.py b/pyasic/miners/whatsminer/btminer/M2X/M29.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M2X/M29.py rename to pyasic/miners/whatsminer/btminer/M2X/M29.py index d1b409b7..42810a6d 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M2X/M29.py +++ b/pyasic/miners/whatsminer/btminer/M2X/M29.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M2X -from pyasic.miners.btc._types import M29V10 # noqa - Ignore access to _module +from pyasic.miners.types import M29V10 class BTMinerM29V10(M2X, M29V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M2X/__init__.py b/pyasic/miners/whatsminer/btminer/M2X/__init__.py similarity index 100% rename from pyasic/miners/btc/whatsminer/btminer/M2X/__init__.py rename to pyasic/miners/whatsminer/btminer/M2X/__init__.py diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M30.py b/pyasic/miners/whatsminer/btminer/M3X/M30.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M30.py rename to pyasic/miners/whatsminer/btminer/M3X/M30.py index fc1e7d77..df7549fa 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M30.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M30V10, M30V20 # noqa - Ignore access to _module +from pyasic.miners.types import M30V10, M30V20 class BTMinerM30V10(M3X, M30V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M30S.py b/pyasic/miners/whatsminer/btminer/M3X/M30S.py similarity index 97% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M30S.py rename to pyasic/miners/whatsminer/btminer/M3X/M30S.py index 67b19c1d..6e5a9f88 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M30S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M30SV10, M30SV20, M30SV30, diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py similarity index 97% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py index 15f86475..20b20b29 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M30SPlusV10, M30SPlusV20, M30SPlusV30, diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py similarity index 97% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py index b13c2d2a..675ec76c 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M30S_Plus_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M30SPlusPlusV10, M30SPlusPlusV20, M30SPlusPlusVE30, diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M31.py b/pyasic/miners/whatsminer/btminer/M3X/M31.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M31.py rename to pyasic/miners/whatsminer/btminer/M3X/M31.py index e0e46158..a8c51032 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M31.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M31.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M31V10, M31V20 # noqa - Ignore access to _module +from pyasic.miners.types import M31V10, M31V20 class BTMinerM31V10(M3X, M31V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M31H.py b/pyasic/miners/whatsminer/btminer/M3X/M31H.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M31H.py rename to pyasic/miners/whatsminer/btminer/M3X/M31H.py index e9259aec..53d484eb 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M31H.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M31H.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M31HV40 # noqa - Ignore access to _module +from pyasic.miners.types import M31HV40 class BTMinerM31HV40(M3X, M31HV40): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M31S.py b/pyasic/miners/whatsminer/btminer/M3X/M31S.py similarity index 96% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M31S.py rename to pyasic/miners/whatsminer/btminer/M3X/M31S.py index 52546337..5248c89f 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M31S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M31S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M31SV10, M31SV20, M31SV30, diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M31SE.py b/pyasic/miners/whatsminer/btminer/M3X/M31SE.py similarity index 92% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M31SE.py rename to pyasic/miners/whatsminer/btminer/M3X/M31SE.py index 4a37ccec..40f124d1 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M31SE.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M31SE.py @@ -15,11 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M31SEV10, - M31SEV20, - M31SEV30, -) +from pyasic.miners.types import M31SEV10, M31SEV20, M31SEV30 class BTMinerM31SEV10(M3X, M31SEV10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M31S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py similarity index 97% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M31S_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py index 8a4d2f60..2da72e6d 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M31S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M31S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M31SPlusV10, M31SPlusV20, M31SPlusV30, diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M32.py b/pyasic/miners/whatsminer/btminer/M3X/M32.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M32.py rename to pyasic/miners/whatsminer/btminer/M3X/M32.py index 64df631b..bfca1797 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M32.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M32.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M32V10, M32V20 # noqa - Ignore access to _module +from pyasic.miners.types import M32V10, M32V20 class BTMinerM32V10(M3X, M32V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M32S.py b/pyasic/miners/whatsminer/btminer/M3X/M32S.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M32S.py rename to pyasic/miners/whatsminer/btminer/M3X/M32S.py index e7dabe23..0cdc586f 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M32S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M32S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M32S # noqa - Ignore access to _module +from pyasic.miners.types import M32S class BTMinerM32S(M3X, M32S): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M33.py b/pyasic/miners/whatsminer/btminer/M3X/M33.py similarity index 92% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M33.py rename to pyasic/miners/whatsminer/btminer/M3X/M33.py index d8c60df0..b5049811 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M33.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M33.py @@ -15,11 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M33V10, - M33V20, - M33V30, -) +from pyasic.miners.types import M33V10, M33V20, M33V30 class BTMinerM33V10(M3X, M33V10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M33S.py b/pyasic/miners/whatsminer/btminer/M3X/M33S.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M33S.py rename to pyasic/miners/whatsminer/btminer/M3X/M33S.py index 19bc584b..346633fe 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M33S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M33S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M33SVG30 # noqa - Ignore access to _module +from pyasic.miners.types import M33SVG30 class BTMinerM33SVG30(M3X, M33SVG30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py similarity index 92% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py index 6ab75acc..5a9aa59f 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py @@ -15,10 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M33SPlusVH20, - M33SPlusVH30, -) +from pyasic.miners.types import M33SPlusVH20, M33SPlusVH30 class BTMinerM33SPlusVH20(M3X, M33SPlusVH20): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus_Plus.py similarity index 91% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M33S_Plus_Plus.py index f6a5f86d..b8651f44 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M33S_Plus_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M33S_Plus_Plus.py @@ -15,11 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M33SPlusPlusVG40, - M33SPlusPlusVH20, - M33SPlusPlusVH30, -) +from pyasic.miners.types import M33SPlusPlusVG40, M33SPlusPlusVH20, M33SPlusPlusVH30 class BTMinerM33SPlusPlusVH20(M3X, M33SPlusPlusVH20): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M34S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M34S_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py index 0303a24e..c4e0c6ea 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M34S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M34S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M34SPlusVE10 # noqa - Ignore access to _module +from pyasic.miners.types import M34SPlusVE10 class BTMinerM34SPlusVE10(M3X, M34SPlusVE10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M36S.py b/pyasic/miners/whatsminer/btminer/M3X/M36S.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M36S.py rename to pyasic/miners/whatsminer/btminer/M3X/M36S.py index 65012922..7713b751 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M36S.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M36S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M36SVE10 # noqa - Ignore access to _module +from pyasic.miners.types import M36SVE10 class BTMinerM36SVE10(M3X, M36SVE10): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M36S_Plus.py index 41692770..e2dd40c5 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M36SPlusVG30 # noqa - Ignore access to _module +from pyasic.miners.types import M36SPlusVG30 class BTMinerM36SPlusVG30(M3X, M36SPlusVG30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus_Plus.py b/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus_Plus.py rename to pyasic/miners/whatsminer/btminer/M3X/M36S_Plus_Plus.py index 6518e627..f59456c7 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M36S_Plus_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M36S_Plus_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M36SPlusPlusVH30 # noqa - Ignore access to _module +from pyasic.miners.types import M36SPlusPlusVH30 class BTMinerM36SPlusPlusVH30(M3X, M36SPlusPlusVH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/M39.py b/pyasic/miners/whatsminer/btminer/M3X/M39.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M3X/M39.py rename to pyasic/miners/whatsminer/btminer/M3X/M39.py index e14dd6c0..5115951c 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M3X/M39.py +++ b/pyasic/miners/whatsminer/btminer/M3X/M39.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M3X -from pyasic.miners.btc._types import M39V20 # noqa - Ignore access to _module +from pyasic.miners.types import M39V20 class BTMinerM39V20(M3X, M39V20): diff --git a/pyasic/miners/btc/whatsminer/btminer/M3X/__init__.py b/pyasic/miners/whatsminer/btminer/M3X/__init__.py similarity index 100% rename from pyasic/miners/btc/whatsminer/btminer/M3X/__init__.py rename to pyasic/miners/whatsminer/btminer/M3X/__init__.py diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M50.py b/pyasic/miners/whatsminer/btminer/M5X/M50.py similarity index 96% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M50.py rename to pyasic/miners/whatsminer/btminer/M5X/M50.py index 430d790d..6fe54e79 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M50.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M50.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M50VG30, M50VH10, M50VH20, diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M50S.py b/pyasic/miners/whatsminer/btminer/M5X/M50S.py similarity index 95% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M50S.py rename to pyasic/miners/whatsminer/btminer/M5X/M50S.py index 10e50317..ecef9195 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M50S.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M50S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module +from pyasic.miners.types import ( M50SVH10, M50SVH20, M50SVH30, diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus.py b/pyasic/miners/whatsminer/btminer/M5X/M50S_Plus.py similarity index 91% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus.py rename to pyasic/miners/whatsminer/btminer/M5X/M50S_Plus.py index 26121a64..382e6ac8 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M50S_Plus.py @@ -15,11 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import ( # noqa - Ignore access to _module - M50SPlusVH30, - M50SPlusVH40, - M50SPlusVJ30, -) +from pyasic.miners.types import M50SPlusVH30, M50SPlusVH40, M50SPlusVJ30 class BTMinerM50SPlusVH30(M5X, M50SPlusVH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus_Plus.py b/pyasic/miners/whatsminer/btminer/M5X/M50S_Plus_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus_Plus.py rename to pyasic/miners/whatsminer/btminer/M5X/M50S_Plus_Plus.py index b447002e..bb8a38e9 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M50S_Plus_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M50S_Plus_Plus.py @@ -15,8 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X - -from pyasic.miners.btc._types.whatsminer.M5X.M50S_Plus_Plus import ( # noqa - ignore _module import +from pyasic.miners.types.whatsminer.M5X.M50S_Plus_Plus import ( # noqa - ignore _module import M50SPlusPlusVK10, M50SPlusPlusVK20, M50SPlusPlusVK30, @@ -28,12 +27,14 @@ class BTMinerM50SPlusPlusVK10( # noqa - ignore ABC method implementation ): pass + class BTMinerM50SPlusPlusVK20( # noqa - ignore ABC method implementation M50SPlusPlusVK20, M5X ): pass + class BTMinerM50SPlusPlusVK30( # noqa - ignore ABC method implementation M50SPlusPlusVK30, M5X ): - pass \ No newline at end of file + pass diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M53.py b/pyasic/miners/whatsminer/btminer/M5X/M53.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M53.py rename to pyasic/miners/whatsminer/btminer/M5X/M53.py index bb7bcc94..0401bf3d 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M53.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M53.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M53VH30 # noqa - Ignore access to _module +from pyasic.miners.types import M53VH30 class BTMinerM53VH30(M5X, M53VH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M53S.py b/pyasic/miners/whatsminer/btminer/M5X/M53S.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M53S.py rename to pyasic/miners/whatsminer/btminer/M5X/M53S.py index d70a03d3..f66a065a 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M53S.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M53S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M53SVH30 # noqa - Ignore access to _module +from pyasic.miners.types import M53SVH30 class BTMinerM53SVH30(M5X, M53SVH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M53S_Plus.py b/pyasic/miners/whatsminer/btminer/M5X/M53S_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M53S_Plus.py rename to pyasic/miners/whatsminer/btminer/M5X/M53S_Plus.py index b95157ec..3922fa1b 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M53S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M53S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M53SPlusVJ30 # noqa - Ignore access to _module +from pyasic.miners.types import M53SPlusVJ30 class BTMinerM53SPlusVJ30(M5X, M53SPlusVJ30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M56.py b/pyasic/miners/whatsminer/btminer/M5X/M56.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M56.py rename to pyasic/miners/whatsminer/btminer/M5X/M56.py index d20abb89..ee2442d6 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M56.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M56.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M56VH30 # noqa - Ignore access to _module +from pyasic.miners.types import M56VH30 class BTMinerM56VH30(M5X, M56VH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M56S.py b/pyasic/miners/whatsminer/btminer/M5X/M56S.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M56S.py rename to pyasic/miners/whatsminer/btminer/M5X/M56S.py index c0baf459..fd61a651 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M56S.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M56S.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M56SVH30 # noqa - Ignore access to _module +from pyasic.miners.types import M56SVH30 class BTMinerM56SVH30(M5X, M56SVH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M56S_Plus.py b/pyasic/miners/whatsminer/btminer/M5X/M56S_Plus.py similarity index 93% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M56S_Plus.py rename to pyasic/miners/whatsminer/btminer/M5X/M56S_Plus.py index e060aa1b..5569986e 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M56S_Plus.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M56S_Plus.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M56SPlusVJ30 # noqa - Ignore access to _module +from pyasic.miners.types import M56SPlusVJ30 class BTMinerM56SPlusVJ30(M5X, M56SPlusVJ30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/M59.py b/pyasic/miners/whatsminer/btminer/M5X/M59.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M5X/M59.py rename to pyasic/miners/whatsminer/btminer/M5X/M59.py index 02eb6919..373d997f 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/M59.py +++ b/pyasic/miners/whatsminer/btminer/M5X/M59.py @@ -15,7 +15,7 @@ # ------------------------------------------------------------------------------ from pyasic.miners.backends import M5X -from pyasic.miners.btc._types import M59VH30 # noqa - Ignore access to _module +from pyasic.miners.types import M59VH30 class BTMinerM59VH30(M5X, M59VH30): diff --git a/pyasic/miners/btc/whatsminer/btminer/M5X/__init__.py b/pyasic/miners/whatsminer/btminer/M5X/__init__.py similarity index 94% rename from pyasic/miners/btc/whatsminer/btminer/M5X/__init__.py rename to pyasic/miners/whatsminer/btminer/M5X/__init__.py index 4a16e71b..4075b3ab 100644 --- a/pyasic/miners/btc/whatsminer/btminer/M5X/__init__.py +++ b/pyasic/miners/whatsminer/btminer/M5X/__init__.py @@ -39,7 +39,11 @@ from .M50S import ( BTMinerM50SVJ30, ) from .M50S_Plus import BTMinerM50SPlusVH30, BTMinerM50SPlusVH40, BTMinerM50SPlusVJ30 -from .M50S_Plus_Plus import BTMinerM50SPlusPlusVK20, BTMinerM50SPlusPlusVK30, BTMinerM50SPlusPlusVK10 +from .M50S_Plus_Plus import ( + BTMinerM50SPlusPlusVK10, + BTMinerM50SPlusPlusVK20, + BTMinerM50SPlusPlusVK30, +) from .M53 import BTMinerM53VH30 from .M53S import BTMinerM53SVH30 from .M53S_Plus import BTMinerM53SPlusVJ30 diff --git a/pyasic/miners/btc/whatsminer/btminer/__init__.py b/pyasic/miners/whatsminer/btminer/__init__.py similarity index 100% rename from pyasic/miners/btc/whatsminer/btminer/__init__.py rename to pyasic/miners/whatsminer/btminer/__init__.py diff --git a/pyasic/miners/zec/__init__.py b/pyasic/miners/zec/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/zec/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/zec/_types/__init__.py b/pyasic/miners/zec/_types/__init__.py deleted file mode 100644 index a2151b40..00000000 --- a/pyasic/miners/zec/_types/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .antminer import * diff --git a/pyasic/miners/zec/antminer/__init__.py b/pyasic/miners/zec/antminer/__init__.py deleted file mode 100644 index 10eb58cb..00000000 --- a/pyasic/miners/zec/antminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .cgminer import * diff --git a/pyasic/miners/zec/antminer/cgminer/__init__.py b/pyasic/miners/zec/antminer/cgminer/__init__.py deleted file mode 100644 index 87dc09f5..00000000 --- a/pyasic/miners/zec/antminer/cgminer/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -from .X15 import * diff --git a/pyasic/network/__init__.py b/pyasic/network/__init__.py index 34fe2b06..d2cc781a 100644 --- a/pyasic/network/__init__.py +++ b/pyasic/network/__init__.py @@ -19,7 +19,7 @@ import ipaddress import logging from typing import AsyncIterator, List, Union -from pyasic.miners.miner_factory import AnyMiner, MinerFactory +from pyasic.miners.miner_factory import AnyMiner, miner_factory from pyasic.network.net_range import MinerNetworkRange from pyasic.settings import PyasicSettings @@ -106,7 +106,7 @@ class MinerNetwork: logging.debug(f"{self} - (Scan Network For Miners) - Scanning") # clear cached miners - MinerFactory().clear_cached_miners() + miner_factory.clear_cached_miners() limit = asyncio.Semaphore(PyasicSettings().network_scan_threads) miners = await asyncio.gather( @@ -232,7 +232,7 @@ async def ping_and_get_miner( # make sure the writer is closed await writer.wait_closed() # ping was successful - return await MinerFactory().get_miner(ip) + return await miner_factory.get_miner(ip) except asyncio.exceptions.TimeoutError: # ping failed if we time out continue diff --git a/pyasic/web/S9.py b/pyasic/web/S9.py deleted file mode 100644 index 2dea01ef..00000000 --- a/pyasic/web/S9.py +++ /dev/null @@ -1,80 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright 2022 Upstream Data Inc - -# - -# Licensed under the Apache License, Version 2.0 (the "License"); - -# you may not use this file except in compliance with the License. - -# You may obtain a copy of the License at - -# - -# http://www.apache.org/licenses/LICENSE-2.0 - -# - -# Unless required by applicable law or agreed to in writing, software - -# distributed under the License is distributed on an "AS IS" BASIS, - -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -# See the License for the specific language governing permissions and - -# limitations under the License. - -# ------------------------------------------------------------------------------ -import json -from typing import Union - -import httpx - -from pyasic.settings import PyasicSettings -from pyasic.web import BaseWebAPI - - -class S9WebAPI(BaseWebAPI): - def __init__(self, ip: str) -> None: - super().__init__(ip) - self.pwd = PyasicSettings().global_antminer_password - - async def send_command( - self, - command: Union[str, bytes], - ignore_errors: bool = False, - allow_warning: bool = True, - **parameters: Union[str, int, bool], - ) -> dict: - url = f"http://{self.ip}/cgi-bin/{command}.cgi" - auth = httpx.DigestAuth(self.username, self.pwd) - try: - async with httpx.AsyncClient() as client: - if parameters: - data = await client.post(url, data=parameters, auth=auth) - else: - data = await client.get(url, auth=auth) - except httpx.HTTPError: - pass - else: - if data.status_code == 200: - try: - return data.json() - except json.decoder.JSONDecodeError: - pass - - async def multicommand( - self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True - ) -> dict: - data = {k: None for k in commands} - data["multicommand"] = True - auth = httpx.DigestAuth(self.username, self.pwd) - for command in commands: - async with httpx.AsyncClient() as client: - try: - url = f"http://{self.ip}/cgi-bin/{command}.cgi" - ret = await client.get(url, auth=auth) - except httpx.HTTPError: - pass - else: - if ret.status_code == 200: - try: - json_data = ret.json() - data[command] = json_data - except json.decoder.JSONDecodeError: - pass - return data - - async def get_system_info(self) -> dict: - return await self.send_command("get_system_info") - - async def get_network_info(self) -> dict: - return await self.send_command("get_network_info") diff --git a/pyasic/web/antminer.py b/pyasic/web/antminer.py index c14e9093..356c6c51 100644 --- a/pyasic/web/antminer.py +++ b/pyasic/web/antminer.py @@ -138,7 +138,9 @@ class AntminerOldWebAPI(BaseWebAPI): try: async with httpx.AsyncClient() as client: if parameters: - data = await client.post(url, data=parameters, auth=auth, timeout=15) + data = await client.post( + url, data=parameters, auth=auth, timeout=15 + ) else: data = await client.get(url, auth=auth) except httpx.HTTPError: