Net: Make CNetMsgMaker more const

jtimon · jtimon · commit fc7f2ffad481 · 2017-01-31T23:29:28.000+01:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -778,7 +778,7 @@ static uint256 most_recent_block_hash;
 
 void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) {
     std::shared_ptr<const CBlockHeaderAndShortTxIDs> pcmpctblock = std::make_shared<const CBlockHeaderAndShortTxIDs> (*pblock, true);
-    CNetMsgMaker msgMaker(PROTOCOL_VERSION);
+    const CNetMsgMaker msgMaker(PROTOCOL_VERSION);
 
     LOCK(cs_main);
 
@@ -960,7 +960,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
 {
     std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
     std::vector<CInv> vNotFound;
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     LOCK(cs_main);
 
     while (it != pfrom->vRecvGetData.end()) {
@@ -1153,7 +1153,7 @@ inline void static SendBlockTransactions(const CBlock& block, const BlockTransac
         resp.txn[i] = block.vtx[req.indexes[i]];
     }
     LOCK(cs_main);
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
     int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS;
     connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp));
 }
@@ -1346,7 +1346,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
     }
 
     // At this point, the outgoing message serialization version can't change.
-    CNetMsgMaker msgMaker(pfrom->GetSendVersion());
+    const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
 
     if (strCommand == NetMsgType::VERACK)
     {
@@ -2721,7 +2721,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             return true;
 
         // If we get here, the outgoing message serialization version is set and can't change.
-        CNetMsgMaker msgMaker(pto->GetSendVersion());
+        const CNetMsgMaker msgMaker(pto->GetSendVersion());
 
         //
         // Message: ping
diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h
@@ -15,7 +15,7 @@ class CNetMsgMaker
     CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}
 
     template <typename... Args>
-    CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args)
+    CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) const
     {
         CSerializedNetMsg msg;
         msg.command = std::move(sCommand);
@@ -24,7 +24,7 @@ class CNetMsgMaker
     }
 
     template <typename... Args>
-    CSerializedNetMsg Make(std::string sCommand, Args&&... args)
+    CSerializedNetMsg Make(std::string sCommand, Args&&... args) const
     {
         return Make(0, std::move(sCommand), std::forward<Args>(args)...);
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class CNetMsgMaker`
`15`	`15`	`CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}`
`16`	`16`
`17`	`17`	`template <typename... Args>`
`18`		`- CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args)`
	`18`	`+ CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) const`
`19`	`19`	`{`
`20`	`20`	`CSerializedNetMsg msg;`
`21`	`21`	`msg.command = std::move(sCommand);`
`@@ -24,7 +24,7 @@ class CNetMsgMaker`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`template <typename... Args>`
`27`		`- CSerializedNetMsg Make(std::string sCommand, Args&&... args)`
	`27`	`+ CSerializedNetMsg Make(std::string sCommand, Args&&... args) const`
`28`	`28`	`{`
`29`	`29`	`return Make(0, std::move(sCommand), std::forward<Args>(args)...);`
`30`	`30`	`}`