Refactor to remove DoubleFromAmount() function

Author: cyrossignol

src/contract/polls.cpp

@@ -15,7 +15,6 @@
 double GetTotalBalance();
 std::string TimestampToHRDate(double dtm);
 double CoinToDouble(double surrogate);
-double DoubleFromAmount(int64_t amount);
 std::string PubKeyToAddress(const CScript& scriptPubKey);
 bool GetEarliestStakeTime(std::string grcaddress, std::string cpid);
 const CBlockIndex* GetHistoricalMagnitude(const NN::MiningId mining_id);
@@ -466,7 +465,7 @@ double GetMoneySupplyFactor()
 
     double TotalNetworkMagnitude = superblock->m_cpids.TotalMagnitude();
     if (TotalNetworkMagnitude < 100) TotalNetworkMagnitude=100;
-    double MoneySupply = DoubleFromAmount(pindexBest->nMoneySupply);
+    double MoneySupply = (double)pindexBest->nMoneySupply / COIN;
     double Factor = (MoneySupply/TotalNetworkMagnitude+.01);
     return Factor;
 }

src/rpcblockchain.cpp

@@ -28,7 +28,6 @@ extern ConvergedScraperStats ConvergedScraperStatsCache;
 using namespace std;
 
 extern std::string YesNo(bool bin);
-extern double DoubleFromAmount(int64_t amount);
 bool AskForOutstandingBlocks(uint256 hashStart);
 bool ForceReorganizeToHash(uint256 NewHash);
 extern UniValue MagnitudeReport(const NN::Cpid cpid);
@@ -1919,11 +1918,6 @@ UniValue MagnitudeReport(const NN::Cpid cpid)
     return json;
 }
 
-double DoubleFromAmount(int64_t amount)
-{
-    return (double)amount / (double)COIN;
-}
-
 UniValue GetJSONBeaconReport()
 {
     UniValue results(UniValue::VARR);

src/rpcrawtransaction.cpp

@@ -28,7 +28,6 @@ std::string TimestampToHRDate(double dtm);
 std::string GetPollXMLElementByPollTitle(std::string pollname, std::string XMLElement1, std::string XMLElement2);
 std::string GetShareType(double dShareType);
 bool PollCreatedAfterSecurityUpgrade(std::string pollname);
-double DoubleFromAmount(int64_t amount);
 
 std::vector<std::pair<std::string, std::string>> GetTxStakeBoincHashInfo(const CMerkleTx& mtx)
 {
@@ -259,7 +258,7 @@ std::vector<std::pair<std::string, std::string>> GetTxNormalBoincHashInfo(const
 
                         double dOutAverage = superblock.m_cpids.AverageMagnitude();
                         double dTotalNetworkMagnitude = (double)superblock.m_cpids.size() * dOutAverage;
-                        double dMoneySupply = DoubleFromAmount(pblockindex->nMoneySupply);
+                        double dMoneySupply = (double)pblockindex->nMoneySupply / COIN;
                         double dMoneySupplyFactor = (dMoneySupply/dTotalNetworkMagnitude + .01);
 
                         dVoteMagnitude = RoundFromString(sVoteMagnitude,2);