Merge bitcoin#18937: refactor: s/command/msg_type/ in CNetMsgMaker and CSerializedNetMsg

MarcoFalke · MarcoFalke · commit 62948caf4446 · 2020-06-19T06:54:24.000-04:00
51e9393 refactor: s/command/msg_type/ in CNetMsgMaker and CSerializedNetMsg (Sebastian Falbesoner) Pull request description: Follow-up PR for bitcoin#18533 -- another small step towards getting rid of the confusing "command" terminology. Also see PR bitcoin#18610 which tackled the functional tests. ACKs for top commit: MarcoFalke: ACK 51e9393 Tree-SHA512: bb6f05a7be6823d5c4eab1d05b31fee944e700946827ad9425d59a3957fd879776c88c606319cbe9832d9451b275baedf913b71429ea3e01e4e82bf2d419e819
diff --git a/src/net.cpp b/src/net.cpp
@@ -737,7 +737,7 @@ void V1TransportSerializer::prepareForTransport(CSerializedNetMsg& msg, std::vec
     uint256 hash = Hash(msg.data.begin(), msg.data.end());
 
     // create header
-    CMessageHeader hdr(Params().MessageStart(), msg.command.c_str(), msg.data.size());
+    CMessageHeader hdr(Params().MessageStart(), msg.m_type.c_str(), msg.data.size());
     memcpy(hdr.pchChecksum, hash.begin(), CMessageHeader::CHECKSUM_SIZE);
 
     // serialize header
@@ -2794,7 +2794,7 @@ bool CConnman::NodeFullyConnected(const CNode* pnode)
 void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 {
     size_t nMessageSize = msg.data.size();
-    LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n",  SanitizeString(msg.command), nMessageSize, pnode->GetId());
+    LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n",  SanitizeString(msg.m_type), nMessageSize, pnode->GetId());
 
     // make sure we use the appropriate network transport format
     std::vector<unsigned char> serializedHeader;
@@ -2806,8 +2806,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
         LOCK(pnode->cs_vSend);
         bool optimisticSend(pnode->vSendMsg.empty());
 
-        //log total amount of bytes per command
-        pnode->mapSendBytesPerMsgCmd[msg.command] += nTotalSize;
+        //log total amount of bytes per message type
+        pnode->mapSendBytesPerMsgCmd[msg.m_type] += nTotalSize;
         pnode->nSendSize += nTotalSize;
 
         if (pnode->nSendSize > nSendBufferMaxSize)
diff --git a/src/net.h b/src/net.h
@@ -110,7 +110,7 @@ struct CSerializedNetMsg
     CSerializedNetMsg& operator=(const CSerializedNetMsg&) = delete;
 
     std::vector<unsigned char> data;
-    std::string command;
+    std::string m_type;
 };
 
 
diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h
@@ -15,18 +15,18 @@ class CNetMsgMaker
     explicit CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}
 
     template <typename... Args>
-    CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) const
+    CSerializedNetMsg Make(int nFlags, std::string msg_type, Args&&... args) const
     {
         CSerializedNetMsg msg;
-        msg.command = std::move(sCommand);
+        msg.m_type = std::move(msg_type);
         CVectorWriter{ SER_NETWORK, nFlags | nVersion, msg.data, 0, std::forward<Args>(args)... };
         return msg;
     }
 
     template <typename... Args>
-    CSerializedNetMsg Make(std::string sCommand, Args&&... args) const
+    CSerializedNetMsg Make(std::string msg_type, Args&&... args) const
     {
-        return Make(0, std::move(sCommand), std::forward<Args>(args)...);
+        return Make(0, std::move(msg_type), std::forward<Args>(args)...);
     }
 
 private:
diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp
@@ -62,7 +62,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
         const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
 
         CSerializedNetMsg net_msg;
-        net_msg.command = random_message_type;
+        net_msg.m_type = random_message_type;
         net_msg.data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
 
         CNode& random_node = *peers.at(fuzzed_data_provider.ConsumeIntegralInRange<int>(0, peers.size() - 1));

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