GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge cd66d8b1d8 into merged_master (Bitcoin PR #20429)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-24 02:44:14 +00:00
commit 89db5e68a5
15 changed files with 45 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/protocol.cpp
View file

@ -5,7 +5,6 @@
#include <protocol.h>
#include <util/strencodings.h>
#include <util/system.h>
static std::atomic<bool> g_initial_block_download_completed(false);
@ -86,7 +85,7 @@ const static std::string allNetMessageTypes[] = {
NetMsgType::CFCHECKPT,
NetMsgType::WTXIDRELAY,
};
const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
const static std::vector<std::string> allNetMessageTypesVec(std::begin(allNetMessageTypes), std::end(allNetMessageTypes));
CMessageHeader::CMessageHeader()
{