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

pull theStack wants to merge 1 commits into bitcoin:master from theStack:20200520-refactor-replace-command-by-msgtype-part-3 changing 4 files +10 −10

theStack commented at 5:55 PM on May 10, 2020: contributor

Follow-up PR for #18533 -- another small step towards getting rid of the confusing "command" terminology. Also see PR #18610 which tackled the functional tests.

in src/net.h:111 in 4f7b60e69d outdated

 107 | @@ -108,7 +108,7 @@ struct CSerializedNetMsg
 108 |      CSerializedNetMsg& operator=(const CSerializedNetMsg&) = delete;
 109 |  
 110 |      std::vector<unsigned char> data;
 111 | -    std::string command;
 112 | +    std::string msg_type;

MarcoFalke commented at 6:21 PM on May 10, 2020:

    std::string m_type;

According to the dev notes, members should be prefixed with m_.

theStack commented at 6:53 PM on May 10, 2020:

Thanks, done.

theStack force-pushed on May 10, 2020
DrahtBot added the label P2P on May 10, 2020
DrahtBot added the label Refactoring on May 10, 2020
refactor: s/command/msg_type/ in CNetMsgMaker and CSerializedNetMsg 51e9393c1f
theStack force-pushed on May 10, 2020
MarcoFalke commented at 10:25 PM on May 13, 2020: member

ACK 51e9393c1f6c9eaac554f821f5327f63bd09c8cf
DrahtBot cross-referenced this on May 20, 2020 from issue Implement ADDRv2 support (part of BIP155) by vasild
DrahtBot commented at 8:15 PM on May 20, 2020: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #19031 (Implement ADDRv2 support (part of BIP155) by vasild)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
MarcoFalke merged this on Jun 19, 2020
MarcoFalke closed this on Jun 19, 2020
jonatack commented at 11:01 AM on June 19, 2020: contributor

Concept ACK, msg_type is better
sidhujag referenced this in commit c47c194b1a on Jul 7, 2020
theStack cross-referenced this on Aug 6, 2020 from issue Per-Peer Message Capture by troygiorshev
jasonbcox referenced this in commit 0b1e6312a7 on Nov 19, 2020
theStack deleted the branch on Dec 1, 2020
hebasto cross-referenced this on Jan 15, 2022 from issue net, refactor: Rename CNetMessage::m_command with CNetMessage::m_type by hebasto
MarcoFalke referenced this in commit 973c390298 on Jan 24, 2022
sidhujag referenced this in commit b135edda87 on Jan 28, 2022
bitcoin locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#18533 scripted-diff: Replace strCommand with msg_type #18610 scripted-diff: test: replace command with msgtype (naming)#19509 Per-Peer Message Capture #24078 net, refactor: Rename CNetMessage::m_command with CNetMessage::m_type #31163 scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}#34203 doc: p2p: replace last remaining "command" terminology with "message type"

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

Conflicts