[Refactoring] Introduce CFinalizedBudget/CBudgetProposal::GetBroadcast

random-zebra · random-zebra · commit d0a959e04007 · 2020-10-22T19:07:20.000+02:00
Returning the serialized object for the network message.
Also, introduce class constructors from CDataStream.
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -1334,6 +1334,25 @@ CBudgetProposal::CBudgetProposal(const CBudgetProposal& other)
     strInvalid = "";
 }
 
+// initialize from network broadcast message
+bool CBudgetProposal::ParseBroadcast(CDataStream& broadcast)
+{
+    *this = CBudgetProposal();
+    try {
+        broadcast >> LIMITED_STRING(strProposalName, 20);
+        broadcast >> LIMITED_STRING(strURL, 64);
+        broadcast >> nTime;
+        broadcast >> nBlockStart;
+        broadcast >> nBlockEnd;
+        broadcast >> nAmount;
+        broadcast >> *(CScriptBase*)(&address);
+        broadcast >> nFeeTXHash;
+    } catch (std::exception& e) {
+        return error("Unable to deserialize proposal broadcast: %s", e.what());
+    }
+    return true;
+}
+
 void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) const
 {
     for (const auto& it: mapVotes) {
@@ -1590,6 +1609,22 @@ int CBudgetProposal::GetRemainingPaymentCount(int nCurrentHeight) const
     return std::min(nPayments, GetTotalPaymentCount());
 }
 
+// return broadcast serialization
+CDataStream CBudgetProposal::GetBroadcast() const
+{
+    CDataStream broadcast(SER_NETWORK, PROTOCOL_VERSION);
+    broadcast.reserve(1000);
+    broadcast << LIMITED_STRING(strProposalName, 20);
+    broadcast << LIMITED_STRING(strURL, 64);
+    broadcast << nTime;
+    broadcast << nBlockStart;
+    broadcast << nBlockEnd;
+    broadcast << nAmount;
+    broadcast << *(CScriptBase*)(&address);
+    broadcast << nFeeTXHash;
+    return broadcast;
+}
+
 inline bool CBudgetProposal::PtrHigherYes(CBudgetProposal* a, CBudgetProposal* b)
 {
     const int netYes_a = a->GetYeas() - a->GetNays();
@@ -1710,6 +1745,20 @@ CFinalizedBudget::CFinalizedBudget(const CFinalizedBudget& other) :
         nTime(other.nTime)
 { }
 
+bool CFinalizedBudget::ParseBroadcast(CDataStream& broadcast)
+{
+    *this = CFinalizedBudget();
+    try {
+        broadcast >> LIMITED_STRING(strBudgetName, 20);
+        broadcast >> nBlockStart;
+        broadcast >> vecBudgetPayments;
+        broadcast >> nFeeTXHash;
+    } catch (std::exception& e) {
+        return error("Unable to deserialize finalized budget broadcast: %s", e.what());
+    }
+    return true;
+}
+
 bool CFinalizedBudget::AddOrUpdateVote(const CFinalizedBudgetVote& vote, std::string& strError)
 {
     const uint256& hash = vote.GetVin().prevout.GetHash();
@@ -2132,6 +2181,19 @@ void CFinalizedBudget::SubmitVote()
     }
 }
 
+// return broadcast serialization
+CDataStream CFinalizedBudget::GetBroadcast() const
+{
+    CDataStream broadcast(SER_NETWORK, PROTOCOL_VERSION);
+    broadcast.reserve(1000);
+    broadcast << LIMITED_STRING(strBudgetName, 20);
+    broadcast << nBlockStart;
+    broadcast << vecBudgetPayments;
+    broadcast << nFeeTXHash;
+    return broadcast;
+}
+
+
 bool CFinalizedBudget::operator>(const CFinalizedBudget& other) const
 {
     const int count = GetVoteCount();
diff --git a/src/masternode-budget.h b/src/masternode-budget.h
@@ -471,6 +471,7 @@ class CFinalizedBudget
         return ss.GetHash();
     }
 
+    // Serialization for local DB
     ADD_SERIALIZE_METHODS;
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action)
@@ -485,6 +486,10 @@ class CFinalizedBudget
         READWRITE(strProposals);
     }
 
+    // Serialization for network messages.
+    bool ParseBroadcast(CDataStream& broadcast);
+    CDataStream GetBroadcast() const;
+
     // compare finalized budget by votes (sort tie with feeHash)
     bool operator>(const CFinalizedBudget& other) const;
     // compare finalized budget pointers
@@ -623,24 +628,26 @@ class CBudgetProposal
         return ss.GetHash();
     }
 
+    // Serialization for local DB
     ADD_SERIALIZE_METHODS;
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
-        //for syncing with other clients
         READWRITE(LIMITED_STRING(strProposalName, 20));
         READWRITE(LIMITED_STRING(strURL, 64));
         READWRITE(nBlockStart);
         READWRITE(nBlockEnd);
         READWRITE(nAmount);
         READWRITE(*(CScriptBase*)(&address));
-        READWRITE(nTime);
         READWRITE(nFeeTXHash);
-
-        //for saving to the serialized db
+        READWRITE(nTime);
         READWRITE(mapVotes);
     }
 
+    // Serialization for network messages.
+    bool ParseBroadcast(CDataStream& broadcast);
+    CDataStream GetBroadcast() const;
+
     // compare proposals by proposal hash
     inline bool operator>(const CBudgetProposal& other) const { return GetHash() > other.GetHash(); }
     // compare proposals pointers by hash
