From cb01c1a8ee6de5dca0107edefd9cfb1be10bb4fc Mon Sep 17 00:00:00 2001
From: UpstreamData <75442874+UpstreamData@users.noreply.github.com>
Date: Mon, 18 Jul 2022 12:05:22 -0600
Subject: [PATCH] update network to scan fast even if some miners are not
 responding properly

---
 pyasic/network/__init__.py  | 34 ++++++++++++----------------------
 pyasic/settings/__init__.py |  4 ++--
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/pyasic/network/__init__.py b/pyasic/network/__init__.py
index 80407441..8e41ecfd 100644
--- a/pyasic/network/__init__.py
+++ b/pyasic/network/__init__.py
@@ -87,7 +87,7 @@ class MinerNetwork:
         for host in local_network.hosts():
 
             # make sure we don't exceed the allowed async tasks
-            if len(scan_tasks) < PyasicSettings().network_scan_threads:
+            if len(scan_tasks) < round(PyasicSettings().network_scan_threads / 3):
                 # add the task to the list
                 scan_tasks.append(self.ping_and_get_miner(host))
             else:
@@ -126,7 +126,7 @@ class MinerNetwork:
         # for each ip on the network, loop through and scan it
         for host in local_network.hosts():
             # make sure we don't exceed the allowed async tasks
-            if len(scan_tasks) >= PyasicSettings().network_scan_threads:
+            if len(scan_tasks) >= round(PyasicSettings().network_scan_threads / 3):
                 # scanned is a loopable list of awaitables
                 scanned = asyncio.as_completed(scan_tasks)
                 # when we scan, empty the scan tasks
@@ -146,31 +146,21 @@ class MinerNetwork:
 
     @staticmethod
     async def ping_miner(ip: ipaddress.ip_address) -> None or ipaddress.ip_address:
-        miner = await ping_miner(ip)
-        if miner:
-            return miner
-        miner = await ping_miner(ip, port=4029)
-        if miner:
-            return miner
-        miner = await ping_miner(ip, port=8889)
-        if miner:
-            return miner
-        return None
+        tasks = [ping_miner(ip, port=port) for port in [4028, 4029, 8889]]
+        for miner in asyncio.as_completed(tasks):
+            miner = await miner
+            if miner:
+                return miner
 
     @staticmethod
     async def ping_and_get_miner(
         ip: ipaddress.ip_address,
     ) -> None or AnyMiner:
-        miner = await ping_and_get_miner(ip)
-        if miner:
-            return miner
-        miner = await ping_and_get_miner(ip, port=4029)
-        if miner:
-            return miner
-        miner = await ping_and_get_miner(ip, port=8889)
-        if miner:
-            return miner
-        return None
+        tasks = [ping_and_get_miner(ip, port=port) for port in [4028, 4029, 8889]]
+        for miner in asyncio.as_completed(tasks):
+            miner = await miner
+            if miner:
+                return miner
 
 
 async def ping_miner(
diff --git a/pyasic/settings/__init__.py b/pyasic/settings/__init__.py
index a3f50a81..3d9569a3 100644
--- a/pyasic/settings/__init__.py
+++ b/pyasic/settings/__init__.py
@@ -12,8 +12,8 @@ class Singleton(type):
 
 @dataclass
 class PyasicSettings(metaclass=Singleton):
-    network_ping_retries: int = 3
-    network_ping_timeout: int = 5
+    network_ping_retries: int = 1
+    network_ping_timeout: int = 3
     network_scan_threads: int = 300
 
     miner_factory_get_version_retries: int = 1