[core] Minor refacturing + unused variable removed

Mrs-X · Mrs-X · commit 76335161a67b · 2018-02-08T22:06:33.000+01:00
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -211,7 +211,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
                     //and higher priority to zpivs that are large in value
                     int64_t nTimeSeen = GetAdjustedTime();
                     double nConfs = 100000;
-                    double dPriorityPrev = dPriority;
 
                     auto it = mapZerocoinspends.find(txid);
                     if (it != mapZerocoinspends.end()) {
@@ -221,19 +220,11 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
                         mapZerocoinspends[txid] = nTimeSeen;
                     }
 
-                    //zPIV spends can have very large priority, prevent datatype problems
                     double nTimePriority = std::pow(GetAdjustedTime() - nTimeSeen, 6);
-                    double fLimit = std::numeric_limits<double>::max() - dPriority;
-                    if (fLimit > (nTimePriority * nConfs))
-                        dPriority += nTimePriority * nConfs;
-                    else
-                        dPriority = std::numeric_limits<double>::max();
-
-                    fLimit = std::numeric_limits<double>::max() / dPriority;
-                    if (fLimit > nTotalIn)
-                        dPriority *= nTotalIn;
-                    else
-                        dPriority = std::numeric_limits<double>::max();
+
+                    // zPIV spends can have very large priority, use non-overflowing safe functions
+                    dPriority = double_safe_addition(dPriority, (nTimePriority * nConfs));
+                    dPriority = double_safe_multiplication(dPriority, nTotalIn);
 
                     continue;
                 }
@@ -279,13 +270,9 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
 
                 int nConf = nHeight - coins->nHeight;
 
-                //zPIV spends can have very large priority, prevent datatype problems
-                double fLimit = std::numeric_limits<double>::max() - dPriority;
+                // zPIV spends can have very large priority, use non-overflowing safe functions
+                dPriority = double_safe_addition(dPriority, ((double)nValueIn * nConf));
 
-                if (fLimit > ((double)nValueIn * nConf))
-                    dPriority += (double)nValueIn * nConf;
-                else
-                    dPriority = std::numeric_limits<double>::max();
             }
             if (fMissingInputs) continue;
 
diff --git a/src/util.cpp b/src/util.cpp
@@ -738,6 +738,26 @@ boost::filesystem::path GetTempPath()
 #endif
 }
 
+double double_safe_addition(double fValue, double fIncrement)
+{
+    double fLimit = std::numeric_limits<double>::max() - fValue;
+
+    if (fLimit > fIncrement)
+        return fValue + fIncrement;
+    else
+        return std::numeric_limits<double>::max();
+}
+
+double double_safe_multiplication(double fValue, double fmultiplicator)
+{
+    double fLimit = std::numeric_limits<double>::max() / fmultiplicator;
+
+    if (fLimit > fmultiplicator)
+        return fValue * fmultiplicator;
+    else
+        return std::numeric_limits<double>::max();
+}
+
 void runCommand(std::string strCommand)
 {
     int nErr = ::system(strCommand.c_str());
diff --git a/src/util.h b/src/util.h
@@ -106,6 +106,8 @@ static inline bool error(const char* format)
     return false;
 }
 
+double double_safe_addition(double fValue, double fIncrement);
+double double_safe_multiplication(double fValue, double fmultiplicator);
 void PrintExceptionContinue(std::exception* pex, const char* pszThread);
 void ParseParameters(int argc, const char* const argv[]);
 void FileCommit(FILE* fileout);

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ static inline bool error(const char* format)`
`106`	`106`	`return false;`
`107`	`107`	`}`
`108`	`108`
	`109`	`+double double_safe_addition(double fValue, double fIncrement);`
	`110`	`+double double_safe_multiplication(double fValue, double fmultiplicator);`
`109`	`111`	`void PrintExceptionContinue(std::exception* pex, const char* pszThread);`
`110`	`112`	`void ParseParameters(int argc, const char* const argv[]);`
`111`	`113`	`void FileCommit(FILE* fileout);`