Merge pull request ethereum-mining#1723 from AndreaLanfranchi/master

Modified URI Parsing (Username / WorkerName / Password)
mengz0 · Nov 29, 2018 · 76a5aad · 76a5aad
2 parents 07ea6f9 + f045321
commit 76a5aad
Show file tree

Hide file tree

Showing 6 changed files with 217 additions and 239 deletions.
diff --git a/ethminer/main.cpp b/ethminer/main.cpp
@@ -503,7 +503,7 @@ class MinerCLI
 
                 URI uri(url);
 
-                if (!uri.Valid() || !uri.KnownScheme() || (m_mode == OperationMode::Mining && uri.Scheme() == "simulation"))
+                if (!uri.Valid() || (m_mode == OperationMode::Mining && uri.Scheme() == "simulation"))
                 {
                     std::string what = "Bad URI : " + uri.str();
                     throw std::invalid_argument(what);

diff --git a/libapicore/ApiServer.cpp b/libapicore/ApiServer.cpp
@@ -503,12 +503,6 @@ void ApiConnection::processRequest(Json::Value& jRequest, Json::Value& jResponse
                 jResponse["error"]["message"] = ("Invalid URI " + uri.str());
                 return;
             }
-            if (!uri.KnownScheme())
-            {
-                jResponse["error"]["code"] = -422;
-                jResponse["error"]["message"] = ("Unknown URI scheme " + uri.Scheme());
-                return;
-            }
 
             // Check other pools already present share the same scheme family (stratum or getwork)
             Json::Value pools = PoolManager::p().getConnectionsJson();