From baaad73eb8f3f7ef8fe7693d7909c7de8772b2fa Mon Sep 17 00:00:00 2001
From: UpstreamData <brett@upstreamdata.ca>
Date: Thu, 26 May 2022 10:39:39 -0600
Subject: [PATCH] fixed a bug with pool prefix not getting removed when getting
 data

---
 miners/_backends/bmminer.py  | 14 ++++++--------
 miners/_backends/bosminer.py | 10 ++++++----
 miners/_backends/btminer.py  | 14 ++++++--------
 miners/_backends/cgminer.py  | 14 ++++++--------
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/miners/_backends/bmminer.py b/miners/_backends/bmminer.py
index c3c8ced4..c20fdce7 100644
--- a/miners/_backends/bmminer.py
+++ b/miners/_backends/bmminer.py
@@ -203,20 +203,18 @@ class BMMiner(BaseMiner):
                 quota = f"{pool_1_quota}/{pool_2_quota}"
 
             if pool_1:
-                if pool_1.startswith("stratum+tcp://"):
-                    pool_1.replace("stratum+tcp://", "")
-                if pool_1.startswith("stratum2+tcp://"):
-                    pool_1.replace("stratum2+tcp://", "")
+                pool_1 = pool_1.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_1_url = pool_1
 
             if pool_1_user:
                 data.pool_1_user = pool_1_user
 
             if pool_2:
-                if pool_2.startswith("stratum+tcp://"):
-                    pool_2.replace("stratum+tcp://", "")
-                if pool_2.startswith("stratum2+tcp://"):
-                    pool_2.replace("stratum2+tcp://", "")
+                pool_2 = pool_2.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_2_url = pool_2
 
             if pool_2_user:
diff --git a/miners/_backends/bosminer.py b/miners/_backends/bosminer.py
index f33efaa5..a3218919 100644
--- a/miners/_backends/bosminer.py
+++ b/miners/_backends/bosminer.py
@@ -328,16 +328,18 @@ class BOSMiner(BaseMiner):
                 quota = f"{pool_1_quota}/{pool_2_quota}"
 
             if pool_1:
-                pool_1 = pool_1.replace("stratum+tcp://", "")
-                pool_1 = pool_1.replace("stratum2+tcp://", "")
+                pool_1 = pool_1.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_1_url = pool_1
 
             if pool_1_user:
                 data.pool_1_user = pool_1_user
 
             if pool_2:
-                pool_2 = pool_2.replace("stratum+tcp://", "")
-                pool_2 = pool_2.replace("stratum2+tcp://", "")
+                pool_2 = pool_2.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_2_url = pool_2
 
             if pool_2_user:
diff --git a/miners/_backends/btminer.py b/miners/_backends/btminer.py
index 8db83366..03c5a42f 100644
--- a/miners/_backends/btminer.py
+++ b/miners/_backends/btminer.py
@@ -188,20 +188,18 @@ class BTMiner(BaseMiner):
                 quota = f"{pool_1_quota}/{pool_2_quota}"
 
             if pool_1:
-                if pool_1.startswith("stratum+tcp://"):
-                    pool_1.replace("stratum+tcp://", "")
-                if pool_1.startswith("stratum2+tcp://"):
-                    pool_1.replace("stratum2+tcp://", "")
+                pool_1 = pool_1.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_1_url = pool_1
 
             if pool_1_user:
                 data.pool_1_user = pool_1_user
 
             if pool_2:
-                if pool_2.startswith("stratum+tcp://"):
-                    pool_2.replace("stratum+tcp://", "")
-                if pool_2.startswith("stratum2+tcp://"):
-                    pool_2.replace("stratum2+tcp://", "")
+                pool_2 = pool_2.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_2_url = pool_2
 
             if pool_2_user:
diff --git a/miners/_backends/cgminer.py b/miners/_backends/cgminer.py
index 0019d0a3..3912c5bb 100644
--- a/miners/_backends/cgminer.py
+++ b/miners/_backends/cgminer.py
@@ -174,20 +174,18 @@ class CGMiner(BaseMiner):
                 quota = f"{pool_1_quota}/{pool_2_quota}"
 
             if pool_1:
-                if pool_1.startswith("stratum+tcp://"):
-                    pool_1.replace("stratum+tcp://", "")
-                if pool_1.startswith("stratum2+tcp://"):
-                    pool_1.replace("stratum2+tcp://", "")
+                pool_1 = pool_1.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_1_url = pool_1
 
             if pool_1_user:
                 data.pool_1_user = pool_1_user
 
             if pool_2:
-                if pool_2.startswith("stratum+tcp://"):
-                    pool_2.replace("stratum+tcp://", "")
-                if pool_2.startswith("stratum2+tcp://"):
-                    pool_2.replace("stratum2+tcp://", "")
+                pool_2 = pool_2.replace("stratum+tcp://", "").replace(
+                    "stratum2+tcp://", ""
+                )
                 data.pool_2_url = pool_2
 
             if pool_2_user: