[Refactoring] Move non-throwing ParseHashStr from rest to core_read

random-zebra · random-zebra · commit 4501198dcd48 · 2021-04-02T12:36:46.000+02:00
diff --git a/src/core_io.h b/src/core_io.h
@@ -23,6 +23,7 @@ extern bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx);
 extern bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
 extern uint256 ParseHashUV(const UniValue& v, const std::string& strName);
 extern uint256 ParseHashStr(const std::string&, const std::string& strName);
+extern bool ParseHashStr(const std::string& strReq, uint256& v);
 extern std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName);
 
 // core_write.cpp
diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -124,6 +124,15 @@ uint256 ParseHashStr(const std::string& strHex, const std::string& strName)
     return result;
 }
 
+bool ParseHashStr(const std::string& strReq, uint256& v)
+{
+    if (!IsHex(strReq) || (strReq.size() != 64))
+        return false;
+
+    v.SetHex(strReq);
+    return true;
+}
+
 std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName)
 {
     std::string strHex;
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -101,15 +101,6 @@ static std::string AvailableDataFormatsString()
     return formats;
 }
 
-static bool ParseHashStr(const std::string& strReq, uint256& v)
-{
-    if (!IsHex(strReq) || (strReq.size() != 64))
-        return false;
-
-    v.SetHex(strReq);
-    return true;
-}
-
 static bool CheckWarmup(HTTPRequest* req)
 {
     std::string statusmessage;
