Move GetMagnitude() methods from Tally to Quorum

After adding the Quorum API, these methods just pull from data stored in
the Quorum classes so this is a more appropriate location for the code.

Author: cyrossignol

src/beacon.cpp

@@ -9,7 +9,7 @@
 #include "contract/contract.h"
 #include "key.h"
 #include "neuralnet/researcher.h"
-#include "neuralnet/tally.h"
+#include "neuralnet/quorum.h"
 
 std::string RetrieveBeaconValueWithMaxAge(const std::string& cpid, int64_t iMaxSeconds);
 std::string ExtractXML(const std::string& XMLdata, const std::string& key, const std::string& key_end);
@@ -335,7 +335,7 @@ BeaconStatus GetBeaconStatus(std::string& sCPID)
     beacon_status.iBeaconTimestamp = BeaconTimeStamp(sCPID);
     beacon_status.timestamp = TimestampToHRDate(beacon_status.iBeaconTimestamp);
     beacon_status.hasBeacon = HasActiveBeacon(sCPID);
-    beacon_status.dPriorSBMagnitude = NN::Tally::GetMagnitude(NN::MiningId::Parse(sCPID)).Floating();
+    beacon_status.dPriorSBMagnitude = NN::Quorum::GetMagnitude(NN::MiningId::Parse(sCPID)).Floating();
     beacon_status.is_mine = (sCPID == NN::GetPrimaryCpid());
 
     return beacon_status;

src/contract/polls.cpp

@@ -99,7 +99,7 @@ std::pair<std::string, std::string> CreateVoteContract(std::string sTitle, std::
     const std::string primary_cpid = NN::GetPrimaryCpid();
 
     std::string GRCAddress = DefaultWalletAddress();
-    double dmag = NN::Tally::MyMagnitude().Floating();
+    double dmag = NN::Quorum::MyMagnitude().Floating();
     double poll_duration = PollDuration(sTitle) * 86400;
 
     // Prevent Double Voting

src/main.cpp

@@ -570,7 +570,7 @@ void GetGlobalStatus()
 
     try
     {
-        double boincmagnitude = NN::Tally::MyMagnitude().Floating();
+        double boincmagnitude = NN::Quorum::MyMagnitude().Floating();
         uint64_t nWeight = 0;
         pwalletMain->GetStakeWeight(nWeight);
         nBoincUtilization = boincmagnitude; //Legacy Support for the about screen
@@ -2623,7 +2623,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
             {
                 // 6-4-2017 - Verify researchers stored block magnitude
                 // 2018 02 04 - Moved here for better effect.
-                double dNeuralNetworkMagnitude = NN::Tally::GetMagnitude(claim.m_mining_id).Floating();
+                double dNeuralNetworkMagnitude = NN::Quorum::GetMagnitude(claim.m_mining_id).Floating();
                 if (claim.m_magnitude > (dNeuralNetworkMagnitude * 1.25)
                     && (fTestNet || (!fTestNet && (pindex->nHeight-1) > 947000)))
                 {

src/miner.cpp

@@ -1060,7 +1060,7 @@ bool CreateGridcoinReward(CBlock &blocknew, CBlockIndex* pindexPrev, int64_t &nR
     }
 
     if (const NN::CpidOption cpid = claim.m_mining_id.TryCpid()) {
-        claim.m_magnitude = NN::Tally::GetMagnitude(*cpid).Floating();
+        claim.m_magnitude = NN::Quorum::GetMagnitude(*cpid).Floating();
     }
 
     LogPrintf(

src/neuralnet/quorum.cpp

@@ -1,7 +1,9 @@
 #include "base58.h"
 #include "main.h"
 #include "neuralnet/claim.h"
+#include "neuralnet/magnitude.h"
 #include "neuralnet/quorum.h"
+#include "neuralnet/researcher.h"
 #include "neuralnet/superblock.h"
 #include "scraper_net.h"
 #include "util/reverse_iterator.h"
@@ -1537,6 +1539,29 @@ bool Quorum::ValidateSuperblock(
     return result != Result::INVALID;
 }
 
+Magnitude Quorum::MyMagnitude()
+{
+    if (const auto cpid_option = NN::Researcher::Get()->Id().TryCpid()) {
+        return Quorum::CurrentSuperblock()->m_cpids.MagnitudeOf(*cpid_option);
+    }
+
+    return Magnitude::Zero();
+}
+
+Magnitude Quorum::GetMagnitude(const Cpid cpid)
+{
+    return Quorum::CurrentSuperblock()->m_cpids.MagnitudeOf(cpid);
+}
+
+Magnitude Quorum::GetMagnitude(const MiningId mining_id)
+{
+    if (const auto cpid_option = mining_id.TryCpid()) {
+        return GetMagnitude(*cpid_option);
+    }
+
+    return Magnitude::Zero();
+}
+
 SuperblockPtr Quorum::CurrentSuperblock()
 {
     return g_superblock_index.Current();

src/neuralnet/quorum.h

@@ -8,6 +8,7 @@ class CBlockIndex;
 namespace NN {
 
 class Claim;
+class Magnitude;
 class QuorumHash;
 class Superblock;
 
@@ -195,6 +196,33 @@ class Quorum
         const bool use_cache = true,
         const size_t hint_bits = 32);
 
+    //!
+    //! \brief Get the current magnitude of the CPID loaded by the wallet.
+    //!
+    //! \return The wallet user's magnitude or zero if the wallet started in
+    //! investor mode.
+    //!
+    static Magnitude MyMagnitude();
+
+    //!
+    //! \brief Get the current magnitude for the specified CPID.
+    //!
+    //! \param cpid The CPID to fetch the magnitude for.
+    //!
+    //! \return Magnitude as of the last tallied superblock.
+    //!
+    static Magnitude GetMagnitude(const Cpid cpid);
+
+    //!
+    //! \brief Get the current magnitude for the specified mining ID.
+    //!
+    //! \param cpid May contain a CPID to fetch the magnitude for.
+    //!
+    //! \return Magnitude as of the last tallied superblock or zero if the
+    //! mining ID represents an investor.
+    //!
+    static Magnitude GetMagnitude(const MiningId mining_id);
+
     //!
     //! \brief Get a reference to the current active superblock.
     //!

src/neuralnet/tally.cpp

@@ -4,7 +4,6 @@
 #include "neuralnet/accrual/research_age.h"
 #include "neuralnet/cpid.h"
 #include "neuralnet/quorum.h"
-#include "neuralnet/researcher.h"
 #include "neuralnet/tally.h"
 #include "util.h"
 
@@ -305,15 +304,6 @@ double Tally::GetMagnitudeUnit(const int64_t payment_time)
     return g_network_tally.GetMagnitudeUnit(payment_time);
 }
 
-Magnitude Tally::MyMagnitude()
-{
-    if (const auto cpid_option = NN::Researcher::Get()->Id().TryCpid()) {
-        return Quorum::CurrentSuperblock()->m_cpids.MagnitudeOf(*cpid_option);
-    }
-
-    return Magnitude::Zero();
-}
-
 ResearchAccountRange Tally::Accounts()
 {
     return g_researcher_tally.Accounts();
@@ -347,20 +337,6 @@ AccrualComputer Tally::GetComputer(
         last_block_ptr->nHeight);
 }
 
-Magnitude Tally::GetMagnitude(const Cpid cpid)
-{
-    return Quorum::CurrentSuperblock()->m_cpids.MagnitudeOf(cpid);
-}
-
-Magnitude Tally::GetMagnitude(const MiningId mining_id)
-{
-    if (const auto cpid_option = mining_id.TryCpid()) {
-        return GetMagnitude(*cpid_option);
-    }
-
-    return Magnitude::Zero();
-}
-
 void Tally::RecordRewardBlock(const CBlockIndex* const pindex)
 {
     if (!pindex || pindex->nResearchSubsidy <= 0) {

src/neuralnet/tally.h

@@ -60,14 +60,6 @@ class Tally
     //!
     static double GetMagnitudeUnit(const int64_t payment_time);
 
-    //!
-    //! \brief Get the current magnitude of the CPID loaded by the wallet.
-    //!
-    //! \return The wallet user's magnitude or zero if the wallet started in
-    //! investor mode.
-    //!
-    static Magnitude MyMagnitude();
-
     //!
     //! \brief Get a traversable object for the research accounts stored in
     //! the tally.
@@ -100,25 +92,6 @@ class Tally
         const int64_t payment_time,
         const CBlockIndex* const last_block_ptr);
 
-    //!
-    //! \brief Get the current magnitude for the specified CPID.
-    //!
-    //! \param cpid The CPID to fetch the magnitude for.
-    //!
-    //! \return Magnitude as of the last tallied superblock.
-    //!
-    static Magnitude GetMagnitude(const Cpid cpid);
-
-    //!
-    //! \brief Get the current magnitude for the specified mining ID.
-    //!
-    //! \param cpid May contain a CPID to fetch the magnitude for.
-    //!
-    //! \return Magnitude as of the last tallied superblock or zero if the
-    //! mining ID represents an investor.
-    //!
-    static Magnitude GetMagnitude(const MiningId mining_id);
-
     //!
     //! \brief Record a block's research reward data in the tally.
     //!

src/rpcblockchain.cpp

@@ -1924,7 +1924,7 @@ UniValue MagnitudeReport(const NN::Cpid cpid)
     const NN::AccrualComputer calc = NN::Tally::GetComputer(cpid, now, pindexBest);
 
     json.pushKV("CPID", cpid.ToString());
-    json.pushKV("Magnitude (Last Superblock)", account.m_magnitude);
+    json.pushKV("Magnitude (Last Superblock)", NN::Quorum::GetMagnitude(cpid).Floating());
     json.pushKV("Current Magnitude Unit", calc->MagnitudeUnit());
 
     json.pushKV("First Payment Time", TimestampToHRDate(account.FirstRewardTime()));