|
12 | 12 | static std::atomic<bool> g_initial_block_download_completed(false);
|
13 | 13 |
|
14 | 14 | namespace NetMsgType {
|
15 |
| -const char *VERSION="version"; |
16 |
| -const char *VERACK="verack"; |
17 |
| -const char *ADDR="addr"; |
18 |
| -const char *ADDRV2="addrv2"; |
19 |
| -const char *SENDADDRV2="sendaddrv2"; |
20 |
| -const char *INV="inv"; |
21 |
| -const char *GETDATA="getdata"; |
22 |
| -const char *MERKLEBLOCK="merkleblock"; |
23 |
| -const char *GETBLOCKS="getblocks"; |
24 |
| -const char *GETHEADERS="getheaders"; |
25 |
| -const char *TX="tx"; |
26 |
| -const char *HEADERS="headers"; |
27 |
| -const char *BLOCK="block"; |
28 |
| -const char *GETADDR="getaddr"; |
29 |
| -const char *MEMPOOL="mempool"; |
30 |
| -const char *PING="ping"; |
31 |
| -const char *PONG="pong"; |
32 |
| -const char *NOTFOUND="notfound"; |
33 |
| -const char *FILTERLOAD="filterload"; |
34 |
| -const char *FILTERADD="filteradd"; |
35 |
| -const char *FILTERCLEAR="filterclear"; |
36 |
| -const char *SENDHEADERS="sendheaders"; |
37 |
| -const char *FEEFILTER="feefilter"; |
38 |
| -const char *SENDCMPCT="sendcmpct"; |
39 |
| -const char *CMPCTBLOCK="cmpctblock"; |
40 |
| -const char *GETBLOCKTXN="getblocktxn"; |
41 |
| -const char *BLOCKTXN="blocktxn"; |
42 |
| -const char *GETCFILTERS="getcfilters"; |
43 |
| -const char *CFILTER="cfilter"; |
44 |
| -const char *GETCFHEADERS="getcfheaders"; |
45 |
| -const char *CFHEADERS="cfheaders"; |
46 |
| -const char *GETCFCHECKPT="getcfcheckpt"; |
47 |
| -const char *CFCHECKPT="cfcheckpt"; |
48 |
| -const char *WTXIDRELAY="wtxidrelay"; |
49 |
| -const char *SENDTXRCNCL="sendtxrcncl"; |
| 15 | +const char* VERSION = "version"; |
| 16 | +const char* VERACK = "verack"; |
| 17 | +const char* ADDR = "addr"; |
| 18 | +const char* ADDRV2 = "addrv2"; |
| 19 | +const char* SENDADDRV2 = "sendaddrv2"; |
| 20 | +const char* INV = "inv"; |
| 21 | +const char* GETDATA = "getdata"; |
| 22 | +const char* MERKLEBLOCK = "merkleblock"; |
| 23 | +const char* GETBLOCKS = "getblocks"; |
| 24 | +const char* GETHEADERS = "getheaders"; |
| 25 | +const char* TX = "tx"; |
| 26 | +const char* HEADERS = "headers"; |
| 27 | +const char* BLOCK = "block"; |
| 28 | +const char* GETADDR = "getaddr"; |
| 29 | +const char* MEMPOOL = "mempool"; |
| 30 | +const char* PING = "ping"; |
| 31 | +const char* PONG = "pong"; |
| 32 | +const char* NOTFOUND = "notfound"; |
| 33 | +const char* FILTERLOAD = "filterload"; |
| 34 | +const char* FILTERADD = "filteradd"; |
| 35 | +const char* FILTERCLEAR = "filterclear"; |
| 36 | +const char* SENDHEADERS = "sendheaders"; |
| 37 | +const char* FEEFILTER = "feefilter"; |
| 38 | +const char* SENDCMPCT = "sendcmpct"; |
| 39 | +const char* CMPCTBLOCK = "cmpctblock"; |
| 40 | +const char* GETBLOCKTXN = "getblocktxn"; |
| 41 | +const char* BLOCKTXN = "blocktxn"; |
| 42 | +const char* GETCFILTERS = "getcfilters"; |
| 43 | +const char* CFILTER = "cfilter"; |
| 44 | +const char* GETCFHEADERS = "getcfheaders"; |
| 45 | +const char* CFHEADERS = "cfheaders"; |
| 46 | +const char* GETCFCHECKPT = "getcfcheckpt"; |
| 47 | +const char* CFCHECKPT = "cfcheckpt"; |
| 48 | +const char* WTXIDRELAY = "wtxidrelay"; |
| 49 | +const char* SENDTXRCNCL = "sendtxrcncl"; |
50 | 50 | } // namespace NetMsgType
|
51 | 51 |
|
52 | 52 | /** All known message types. Keep this in the same order as the list of
|
53 | 53 | * messages above and in protocol.h.
|
54 | 54 | */
|
55 |
| -const static std::string allNetMessageTypes[] = { |
| 55 | +const static std::vector<std::string> g_all_net_message_types{ |
56 | 56 | NetMsgType::VERSION,
|
57 | 57 | NetMsgType::VERACK,
|
58 | 58 | NetMsgType::ADDR,
|
@@ -89,7 +89,6 @@ const static std::string allNetMessageTypes[] = {
|
89 | 89 | NetMsgType::WTXIDRELAY,
|
90 | 90 | NetMsgType::SENDTXRCNCL,
|
91 | 91 | };
|
92 |
| -const static std::vector<std::string> allNetMessageTypesVec(std::begin(allNetMessageTypes), std::end(allNetMessageTypes)); |
93 | 92 |
|
94 | 93 | CMessageHeader::CMessageHeader(const MessageStartChars& pchMessageStartIn, const char* pszCommand, unsigned int nMessageSizeIn)
|
95 | 94 | {
|
@@ -182,7 +181,7 @@ std::string CInv::ToString() const
|
182 | 181 |
|
183 | 182 | const std::vector<std::string> &getAllNetMessageTypes()
|
184 | 183 | {
|
185 |
| - return allNetMessageTypesVec; |
| 184 | + return g_all_net_message_types; |
186 | 185 | }
|
187 | 186 |
|
188 | 187 | /**
|
|
0 commit comments