Convert to new serialization (step 2). Focused on object's serializat…

…ions that doesn't require an special treatment.
PIVX-Project · Jul 3, 2021 · eccd473 · eccd473
1 parent 0f15784
commit eccd473
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 210 deletions.
diff --git a/src/budget/budgetproposal.h b/src/budget/budgetproposal.h
@@ -106,19 +106,17 @@ class CBudgetProposal
     }
 
     // Serialization for local DB
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
+    SERIALIZE_METHODS(CBudgetProposal, obj)
     {
-        READWRITE(LIMITED_STRING(strProposalName, 20));
-        READWRITE(LIMITED_STRING(strURL, 64));
-        READWRITE(nBlockStart);
-        READWRITE(nBlockEnd);
-        READWRITE(nAmount);
-        READWRITE(address);
-        READWRITE(nFeeTXHash);
-        READWRITE(nTime);
-        READWRITE(mapVotes);
+        READWRITE(LIMITED_STRING(obj.strProposalName, 20));
+        READWRITE(LIMITED_STRING(obj.strURL, 64));
+        READWRITE(obj.nBlockStart);
+        READWRITE(obj.nBlockEnd);
+        READWRITE(obj.nAmount);
+        READWRITE(obj.address);
+        READWRITE(obj.nFeeTXHash);
+        READWRITE(obj.nTime);
+        READWRITE(obj.mapVotes);
     }
 
     // Serialization for network messages.

diff --git a/src/budget/finalizedbudget.h b/src/budget/finalizedbudget.h
@@ -106,18 +106,16 @@ class CFinalizedBudget
     }
 
     // Serialization for local DB
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
+    SERIALIZE_METHODS(CFinalizedBudget, obj)
     {
-        READWRITE(LIMITED_STRING(strBudgetName, 20));
-        READWRITE(nFeeTXHash);
-        READWRITE(nTime);
-        READWRITE(nBlockStart);
-        READWRITE(vecBudgetPayments);
-        READWRITE(fAutoChecked);
-        READWRITE(mapVotes);
-        READWRITE(strProposals);
+        READWRITE(LIMITED_STRING(obj.strBudgetName, 20));
+        READWRITE(obj.nFeeTXHash);
+        READWRITE(obj.nTime);
+        READWRITE(obj.nBlockStart);
+        READWRITE(obj.vecBudgetPayments);
+        READWRITE(obj.fAutoChecked);
+        READWRITE(obj.mapVotes);
+        READWRITE(obj.strProposals);
     }
 
     // Serialization for network messages.
@@ -155,16 +153,8 @@ class CTxBudgetPayment
         nAmount(_nAmount)
     {}
 
-    ADD_SERIALIZE_METHODS;
-
     //for saving to the serialized db
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(payee);
-        READWRITE(nAmount);
-        READWRITE(nProposalHash);
-    }
+    SERIALIZE_METHODS(CTxBudgetPayment, obj) { READWRITE(obj.payee, obj.nAmount, obj.nProposalHash); }
 
     // compare payments by proposal hash
     inline bool operator>(const CTxBudgetPayment& other) const

diff --git a/src/crypter.h b/src/crypter.h
@@ -46,17 +46,7 @@ class CMasterKey
     //! such as the various parameters to scrypt
     std::vector<unsigned char> vchOtherDerivationParameters;
 
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(vchCryptedKey);
-        READWRITE(vchSalt);
-        READWRITE(nDerivationMethod);
-        READWRITE(nDeriveIterations);
-        READWRITE(vchOtherDerivationParameters);
-    }
+    SERIALIZE_METHODS(CMasterKey, obj) { READWRITE(obj.vchCryptedKey, obj.vchSalt, obj.nDerivationMethod, obj.nDeriveIterations, obj.vchOtherDerivationParameters); }
 
     CMasterKey()
     {

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
@@ -57,30 +57,24 @@ class CDeterministicMNState
         scriptOperatorPayout = pl.scriptOperatorPayout;
     }
     template <typename Stream>
-    CDeterministicMNState(deserialize_type, Stream& s)
-    {
-        s >> *this;
-    }
+    CDeterministicMNState(deserialize_type, Stream& s) { s >> *this; }
 
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
+    SERIALIZE_METHODS(CDeterministicMNState, obj)
     {
-        READWRITE(nRegisteredHeight);
-        READWRITE(nLastPaidHeight);
-        READWRITE(nPoSePenalty);
-        READWRITE(nPoSeRevivedHeight);
-        READWRITE(nPoSeBanHeight);
-        READWRITE(nRevocationReason);
-        READWRITE(confirmedHash);
-        READWRITE(confirmedHashWithProRegTxHash);
-        READWRITE(keyIDOwner);
-        READWRITE(keyIDOperator);
-        READWRITE(keyIDVoting);
-        READWRITE(addr);
-        READWRITE(scriptPayout);
-        READWRITE(scriptOperatorPayout);
+        READWRITE(obj.nRegisteredHeight);
+        READWRITE(obj.nLastPaidHeight);
+        READWRITE(obj.nPoSePenalty);
+        READWRITE(obj.nPoSeRevivedHeight);
+        READWRITE(obj.nPoSeBanHeight);
+        READWRITE(obj.nRevocationReason);
+        READWRITE(obj.confirmedHash);
+        READWRITE(obj.confirmedHashWithProRegTxHash);
+        READWRITE(obj.keyIDOwner);
+        READWRITE(obj.keyIDOperator);
+        READWRITE(obj.keyIDVoting);
+        READWRITE(obj.addr);
+        READWRITE(obj.scriptPayout);
+        READWRITE(obj.scriptOperatorPayout);
     }
 
     void UpdateConfirmedHash(const uint256& _proTxHash, const uint256& _confirmedHash)

diff --git a/src/libzerocoin/Coin.h b/src/libzerocoin/Coin.h
@@ -75,13 +75,7 @@ class PublicCoin
      */
     bool validate() const;
 
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(value);
-        READWRITE(denomination);
-    }
+    SERIALIZE_METHODS(PublicCoin, obj) { READWRITE(obj.value, obj.denomination); }
 
 private:
     const ZerocoinParams* params;

diff --git a/src/libzerocoin/CoinRandomnessSchnorrSignature.h b/src/libzerocoin/CoinRandomnessSchnorrSignature.h
@@ -39,13 +39,7 @@ class CoinRandomnessSchnorrSignature {
      */
     bool Verify(const ZerocoinParams* zcparams, const CBigNum& S, const CBigNum& C, const uint256 msghash) const;
 
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(alpha);
-        READWRITE(beta);
-    }
+    SERIALIZE_METHODS(CoinRandomnessSchnorrSignature, obj) { READWRITE(obj.alpha, obj.beta); }
 
 private:
     // signature components

diff --git a/src/libzerocoin/CoinSpend.h b/src/libzerocoin/CoinSpend.h
@@ -32,14 +32,11 @@ namespace libzerocoin
 class AccumulatorProofOfKnowledge {
 public:
     AccumulatorProofOfKnowledge() {};
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(C_e); READWRITE(C_u); READWRITE(C_r); READWRITE(st_1); READWRITE(st_2); READWRITE(st_3);
-        READWRITE(t_1); READWRITE(t_2); READWRITE(t_3); READWRITE(t_4); READWRITE(s_alpha); READWRITE(s_beta);
-        READWRITE(s_zeta); READWRITE(s_sigma); READWRITE(s_eta); READWRITE(s_epsilon);
-        READWRITE(s_delta); READWRITE(s_xi); READWRITE(s_phi); READWRITE(s_gamma); READWRITE(s_psi);
+    SERIALIZE_METHODS(AccumulatorProofOfKnowledge, obj) {
+        READWRITE(obj.C_e, obj.C_u, obj.C_r, obj.st_1, obj.st_2, obj.st_3);
+        READWRITE(obj.t_1, obj.t_2, obj.t_3, obj.t_4, obj.s_alpha, obj.s_beta);
+        READWRITE(obj.s_zeta, obj.s_sigma, obj.s_eta, obj.s_epsilon);
+        READWRITE(obj.s_delta, obj.s_xi, obj.s_phi, obj.s_gamma, obj.s_psi);
     }
 private:
     CBigNum C_e, C_u, C_r;
@@ -55,14 +52,7 @@ class AccumulatorProofOfKnowledge {
 class SerialNumberSignatureOfKnowledge {
 public:
     SerialNumberSignatureOfKnowledge(){};
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(s_notprime);
-        READWRITE(sprime);
-        READWRITE(hash);
-    }
+    SERIALIZE_METHODS(SerialNumberSignatureOfKnowledge, obj) { READWRITE(obj.s_notprime, obj.sprime, obj.hash); }
 private:
     uint256 hash;
     std::vector<CBigNum> s_notprime;
@@ -74,12 +64,7 @@ class SerialNumberSignatureOfKnowledge {
 class CommitmentProofOfKnowledge {
 public:
     CommitmentProofOfKnowledge() {};
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(S1); READWRITE(S2); READWRITE(S3); READWRITE(challenge);
-    }
+    SERIALIZE_METHODS(CommitmentProofOfKnowledge, obj) { READWRITE(obj.S1,obj.S2, obj.S3, obj.challenge); }
 private:
     CBigNum S1, S2, S3, challenge;
 };

diff --git a/src/libzerocoin/Commitment.h b/src/libzerocoin/Commitment.h
@@ -54,12 +54,7 @@ class Commitment {
     CBigNum randomness;
     const CBigNum contents;
 
-    ADD_SERIALIZE_METHODS;
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(commitmentValue); READWRITE(randomness); READWRITE(contents);
-    }
+    SERIALIZE_METHODS(Commitment, obj) { READWRITE(obj.commitmentValue, obj.randomness, obj.contents); }
 };
 } /* namespace libzerocoin */
 #endif /* COMMITMENT_H_ */
diff --git a/src/libzerocoin/Params.h b/src/libzerocoin/Params.h
@@ -56,14 +56,7 @@ class IntegerGroupParams {
 	 */
 	CBigNum groupOrder;
 
-	ADD_SERIALIZE_METHODS;
-  template <typename Stream, typename Operation>  inline void SerializationOp(Stream& s, Operation ser_action) {
-		    READWRITE(initialized);
-		    READWRITE(g);
-		    READWRITE(h);
-		    READWRITE(modulus);
-		    READWRITE(groupOrder);
-	}	
+    SERIALIZE_METHODS(IntegerGroupParams, obj) { READWRITE(obj.initialized, obj.g , obj.h, obj.modulus, obj.groupOrder); }
 };
 
 class AccumulatorAndProofParams {
@@ -134,23 +127,15 @@ class AccumulatorAndProofParams {
 	 */
 	uint32_t k_prime;
 
-	/**
-	 * Security parameter.
-	 * The statistical zero-knowledgeness of the accumulator proof.
-	 */
-	uint32_t k_dprime;
-	ADD_SERIALIZE_METHODS;
-  template <typename Stream, typename Operation>  inline void SerializationOp(Stream& s, Operation ser_action) {
-	    READWRITE(initialized);
-	    READWRITE(accumulatorModulus);
-	    READWRITE(accumulatorBase);
-	    READWRITE(accumulatorPoKCommitmentGroup);
-	    READWRITE(accumulatorQRNCommitmentGroup);
-	    READWRITE(minCoinValue);
-	    READWRITE(maxCoinValue);
-	    READWRITE(k_prime);
-	    READWRITE(k_dprime);
-  }
+    /**
+     * Security parameter.
+     * The statistical zero-knowledgeness of the accumulator proof.
+     */
+    uint32_t k_dprime;
+    SERIALIZE_METHODS(AccumulatorAndProofParams, obj) {
+        READWRITE(obj.initialized, obj.accumulatorModulus, obj.accumulatorBase, obj.accumulatorPoKCommitmentGroup);
+        READWRITE(obj.accumulatorQRNCommitmentGroup, obj.minCoinValue, obj.maxCoinValue, obj.k_prime, obj.k_dprime);
+    }
 };
 
 class ZerocoinParams {
@@ -203,16 +188,10 @@ class ZerocoinParams {
 	 * proofs.
 	 */
 	uint32_t zkp_hash_len;
-
-	ADD_SERIALIZE_METHODS;
-  template <typename Stream, typename Operation>  inline void SerializationOp(Stream& s, Operation ser_action) {
-	    READWRITE(initialized);
-	    READWRITE(accumulatorParams);
-	    READWRITE(coinCommitmentGroup);
-	    READWRITE(serialNumberSoKCommitmentGroup);
-	    READWRITE(zkp_iterations);
-	    READWRITE(zkp_hash_len);
-	}
+
+    SERIALIZE_METHODS(ZerocoinParams, obj) {
+        READWRITE(obj.initialized, obj.accumulatorParams, obj.coinCommitmentGroup, obj.serialNumberSoKCommitmentGroup, obj.zkp_iterations, obj.zkp_hash_len);
+    }
 };
 
 } /* namespace libzerocoin */

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -80,14 +80,7 @@ class CMasternodePayee
         nVotes = nVotesIn;
     }
 
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(scriptPubKey);
-        READWRITE(nVotes);
-    }
+    SERIALIZE_METHODS(CMasternodePayee, obj) { READWRITE(obj.scriptPubKey, obj.nVotes); }
 };
 
 // Keep track of votes for payees from masternodes
@@ -152,14 +145,7 @@ class CMasternodeBlockPayees
     bool IsTransactionValid(const CTransaction& txNew);
     std::string GetRequiredPaymentsString();
 
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(nBlockHeight);
-        READWRITE(vecPayments);
-    }
+    SERIALIZE_METHODS(CMasternodeBlockPayees, obj) { READWRITE(obj.nBlockHeight, obj.vecPayments); }
 };
 
 // for storing the winning payments
@@ -290,14 +276,7 @@ class CMasternodePayments
     void FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTransaction& txCoinstake, const CBlockIndex* pindexPrev, bool fProofOfStake) const;
     std::string ToString() const;
 
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
-    {
-        READWRITE(mapMasternodePayeeVotes);
-        READWRITE(mapMasternodeBlocks);
-    }
+    SERIALIZE_METHODS(CMasternodePayments, obj) { READWRITE(obj.mapMasternodePayeeVotes, obj.mapMasternodeBlocks); }
 };
 
 

diff --git a/src/masternode.h b/src/masternode.h
@@ -281,20 +281,17 @@ class CMasternodeBroadcast : public CMasternode
     bool Sign(const std::string strSignKey);
     bool CheckSignature() const;
 
-    ADD_SERIALIZE_METHODS;
-
-    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action)
+    SERIALIZE_METHODS(CMasternodeBroadcast, obj)
     {
-        READWRITE(vin);
-        READWRITE(addr);
-        READWRITE(pubKeyCollateralAddress);
-        READWRITE(pubKeyMasternode);
-        READWRITE(vchSig);
-        READWRITE(sigTime);
-        READWRITE(protocolVersion);
-        READWRITE(lastPing);
-        READWRITE(nMessVersion);
+        READWRITE(obj.vin);
+        READWRITE(obj.addr);
+        READWRITE(obj.pubKeyCollateralAddress);
+        READWRITE(obj.pubKeyMasternode);
+        READWRITE(obj.vchSig);
+        READWRITE(obj.sigTime);
+        READWRITE(obj.protocolVersion);
+        READWRITE(obj.lastPing);
+        READWRITE(obj.nMessVersion);
     }
 
     /// Create Masternode broadcast, needs to be relayed manually after that