Change VersionInfo class to convert functions

Author: Sergey

src/rpcmasternode.cpp

@@ -812,6 +812,6 @@ UniValue sentinelping(const UniValue& params, bool fHelp)
         );
     }
 
-    activeMasternode.UpdateSentinelPing(VersionInfo(params[0].get_str()));
+    activeMasternode.UpdateSentinelPing(StringVersionToInt(params[0].get_str()));
     return true;
 }

src/test/rpc_tests.cpp

@@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE(rpc_sentinel_ping)
 {
     BOOST_CHECK_NO_THROW(CallRPC("sentinelping 1.0.2"));
     BOOST_CHECK_THROW(CallRPC("sentinelping"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("sentinelping 2"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("sentinelping 2"), bad_cast);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

src/test/util_tests.cpp

@@ -491,19 +491,17 @@ BOOST_AUTO_TEST_CASE(test_ParseFixedPoint)
 
 BOOST_AUTO_TEST_CASE(version_info_helper)
 {
-    BOOST_CHECK(VersionInfo("1.1.1") == 0x010101);
-    BOOST_CHECK(VersionInfo(0x010101) == 0x010101);
-    BOOST_CHECK(std::string(VersionInfo("1.1.1")) == "1.1.1");
-    BOOST_CHECK(std::string(VersionInfo(0x010101)) == "1.1.1");
-
-    BOOST_CHECK_THROW(VersionInfo("1.1.hgdghfgf"), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo("1.1"), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo("1.1.1f"), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo("1.1.1000"), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo("10"), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo("1.1.1.1"), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo(0x01010101), runtime_error);
-    BOOST_CHECK_THROW(VersionInfo(0), runtime_error);
+    BOOST_CHECK(StringVersionToInt("1.1.1") == 0x010101);
+    BOOST_CHECK(IntVersionToString(0x010101) == "1.1.1");
+
+    BOOST_CHECK_THROW(StringVersionToInt("1.1.hgdghfgf"), bad_cast);
+    BOOST_CHECK_THROW(StringVersionToInt("1.1"), bad_cast);
+    BOOST_CHECK_THROW(StringVersionToInt("1.1.1f"), bad_cast);
+    BOOST_CHECK_THROW(StringVersionToInt("1.1.1000"), bad_cast);
+    BOOST_CHECK_THROW(StringVersionToInt("10"), bad_cast);
+    BOOST_CHECK_THROW(StringVersionToInt("1.1.1.1"), bad_cast);
+    BOOST_CHECK_THROW(IntVersionToString(0x01010101), bad_cast);
+    BOOST_CHECK_THROW(IntVersionToString(0), bad_cast);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

src/util.cpp

@@ -954,40 +954,33 @@ int GetNumCores()
 #endif
 }
 
-VersionInfo::VersionInfo(uint32_t version)
-{
-    if((version >> 24) > 0)
-        throw std::runtime_error("Invalid version format");
-    if(version == 0)
-        throw std::runtime_error("Invalid version format");
-    nVersion = version;
-}
 
-VersionInfo::VersionInfo(const std::string& versionInfo)
+uint32_t StringVersionToInt(const std::string& strVersion)
 {
     std::vector<std::string> tokens;
-    boost::split(tokens, versionInfo, boost::is_any_of("."));
+    boost::split(tokens, strVersion, boost::is_any_of("."));
     if(tokens.size() != 3)
-        throw std::runtime_error("Invalid version format");
-    uint32_t version = 0;
+        throw std::bad_cast();
+    uint32_t nVersion = 0;
     for(unsigned idx = 0; idx < 3; idx++)
     {
         if(tokens[idx].length() == 0)
-            throw std::runtime_error("Invalid version format");
-        if(!std::none_of(tokens[idx].begin(), tokens[idx].end(),
-                         [](char c){return !std::isdigit(c);}))
-            throw std::runtime_error("Invalid version format");
-        uint32_t value = atol(tokens[idx].c_str());
+            throw std::bad_cast();
+        uint32_t value = boost::lexical_cast<uint32_t>(tokens[idx]);
         if(value > 255)
-            throw std::runtime_error("Invalid version format");
-        version <<= 8;
-        version |= value;
+            throw std::bad_cast();
+        nVersion <<= 8;
+        nVersion |= value;
     }
-    nVersion = version;
+    return nVersion;
 }
 
-VersionInfo::operator std::string() const
+std::string IntVersionToString(uint32_t nVersion)
 {
+    if((nVersion >> 24) > 0) // MSB is always 0
+        throw std::bad_cast();
+    if(nVersion == 0)
+        throw std::bad_cast();
     std::array<std::string, 3> tokens;
     for(unsigned idx = 0; idx < 3; idx++)
     {
@@ -997,8 +990,3 @@ VersionInfo::operator std::string() const
     }
     return boost::join(tokens, ".");
 }
-
-VersionInfo::operator uint32_t() const
-{
-    return nVersion;
-}

src/util.h

@@ -272,22 +272,22 @@ template <typename Callable> void TraceThread(const char* name,  Callable func)
 }
 
 
-/** Helper class to convert version strings of "x.x.x" format
- * to 4-byte unsigned integer and vice versa.
- * Most significant byte in integer is always 0.
+/**
+ * @brief Converts version strings to 4-byte unsigned integer
+ * @param strVersion version in "x.x.x" format (decimal digits only)
+ * @return 4-byte unsigned integer, most significant byte is always 0
+ * Throws std::bad_cast if format doesn\t match.
  */
-class VersionInfo{
-    uint32_t nVersion;
-public:
-    VersionInfo(uint32_t version);
-    VersionInfo(const std::string& version);
+uint32_t StringVersionToInt(const std::string& strVersion);
 
-    VersionInfo(const VersionInfo&) = default;
-    VersionInfo(VersionInfo&&) = default;
-    VersionInfo& operator=(const VersionInfo&) = default;
 
-    operator uint32_t() const;
-    operator std::string() const;
-};
+/**
+ * @brief Converts version as 4-byte unsigned integer to string
+ * @param nVersion 4-byte unsigned integer, most significant byte is always 0
+ * @return version string in "x.x.x" format (last 3 bytes as version parts)
+ * Throws std::bad_cast if format doesn\t match.
+ */
+std::string IntVersionToString(uint32_t nVersion);
+
 
 #endif // BITCOIN_UTIL_H