[Refactor] Initialize Gov Objects from serialized messages

random-zebra · random-zebra · commit 5c8804597f6d · 2020-10-22T19:09:59.000+02:00
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -1032,25 +1032,25 @@ void CBudgetManager::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
         LogPrint(BCLog::MNBUDGET, "mnvs - Sent Masternode votes to peer %i\n", pfrom->GetId());
     }
 
-    if (strCommand == NetMsgType::BUDGETPROPOSAL) { //Masternode Proposal
-        CBudgetProposalBroadcast budgetProposalBroadcast;
-        vRecv >> budgetProposalBroadcast;
-
-        const uint256& nHash = budgetProposalBroadcast.GetHash();
+    if (strCommand == NetMsgType::BUDGETPROPOSAL) {
+        // Masternode Proposal
+        CBudgetProposal proposal;
+        if (!proposal.ParseBroadcast(vRecv)) {
+            // !TODO: we should probably call misbehaving here
+            return;
+        }
+        const uint256& nHash = proposal.GetHash();
         if (HaveProposal(nHash)) {
             masternodeSync.AddedBudgetItem(nHash);
             return;
         }
-
-        CBudgetProposal budgetProposal(budgetProposalBroadcast);
-        if (!AddProposal(budgetProposal)) {
+        if (!AddProposal(proposal)) {
             return;
         }
-        budgetProposalBroadcast.Relay();
+        proposal.Relay();
         masternodeSync.AddedBudgetItem(nHash);
 
         LogPrint(BCLog::MNBUDGET,"mprop (new) %s\n", nHash.ToString());
-
         //We might have active votes for this proposal that are valid now
         CheckOrphanVotes();
     }
@@ -1095,25 +1095,25 @@ void CBudgetManager::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
         LogPrint(BCLog::MNBUDGET,"mvote - new budget vote for budget %s - %s\n", vote.GetProposalHash().ToString(),  vote.GetHash().ToString());
     }
 
-    if (strCommand == NetMsgType::FINALBUDGET) { //Finalized Budget Suggestion
-        CFinalizedBudgetBroadcast finalizedBudgetBroadcast;
-        vRecv >> finalizedBudgetBroadcast;
-
-        const uint256& nHash = finalizedBudgetBroadcast.GetHash();
+    if (strCommand == NetMsgType::FINALBUDGET) {
+        // Finalized Budget Suggestion
+        CFinalizedBudget finalbudget;
+        if (!finalbudget.ParseBroadcast(vRecv)) {
+            // !TODO: we should probably call misbehaving here
+            return;
+        }
+        const uint256& nHash = finalbudget.GetHash();
         if (HaveFinalizedBudget(nHash)) {
             masternodeSync.AddedBudgetItem(nHash);
             return;
         }
-
-        CFinalizedBudget finalizedBudget(finalizedBudgetBroadcast);
-        if (!AddFinalizedBudget(finalizedBudget)) {
+        if (!AddFinalizedBudget(finalbudget)) {
             return;
         }
-        finalizedBudgetBroadcast.Relay();
+        finalbudget.Relay();
         masternodeSync.AddedBudgetItem(nHash);
 
         LogPrint(BCLog::MNBUDGET,"fbs (new) %s\n", nHash.ToString());
-
         //we might have active votes for this budget that are now valid
         CheckOrphanVotes();
     }
@@ -1614,6 +1614,12 @@ inline bool CBudgetProposal::PtrHigherYes(CBudgetProposal* a, CBudgetProposal* b
     return netYes_a > netYes_b;
 }
 
+void CBudgetProposal::Relay()
+{
+    CInv inv(MSG_BUDGET_PROPOSAL, GetHash());
+    g_connman->RelayInv(inv);
+}
+
 CBudgetProposalBroadcast::CBudgetProposalBroadcast(std::string strProposalNameIn, std::string strURLIn, int nPaymentCount, CScript addressIn, CAmount nAmountIn, int nBlockStartIn, uint256 nFeeTXHashIn)
 {
     strProposalName = strProposalNameIn;
@@ -2183,6 +2189,12 @@ bool CFinalizedBudget::operator>(const CFinalizedBudget& other) const
     return count > otherCount;
 }
 
+void CFinalizedBudget::Relay()
+{
+    CInv inv(MSG_BUDGET_FINALIZED, GetHash());
+    g_connman->RelayInv(inv);
+}
+
 CFinalizedBudgetBroadcast::CFinalizedBudgetBroadcast() :
         CFinalizedBudget()
 { }
diff --git a/src/masternode-budget.h b/src/masternode-budget.h
@@ -467,6 +467,7 @@ class CFinalizedBudget
     // Serialization for network messages.
     bool ParseBroadcast(CDataStream& broadcast);
     CDataStream GetBroadcast() const;
+    void Relay();
 
     // compare finalized budget by votes (sort tie with feeHash)
     bool operator>(const CFinalizedBudget& other) const;
@@ -625,6 +626,7 @@ class CBudgetProposal
     // Serialization for network messages.
     bool ParseBroadcast(CDataStream& broadcast);
     CDataStream GetBroadcast() const;
+    void Relay();
 
     // compare proposals by proposal hash
     inline bool operator>(const CBudgetProposal& other) const { return GetHash() > other.GetHash(); }
