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 b75f2ad72d into merged_master (Bitcoin PR #19660)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-27 04:05:36 +00:00
commit 419fd4f90d
17 changed files with 53 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -1275,8 +1275,8 @@ bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const FlatFilePos& pos, c
if (memcmp(blk_start, message_start, CMessageHeader::MESSAGE_START_SIZE)) {
return error("%s: Block magic mismatch for %s: %s versus expected %s", __func__, pos.ToString(),
HexStr(blk_start, blk_start + CMessageHeader::MESSAGE_START_SIZE),
HexStr(message_start, message_start + CMessageHeader::MESSAGE_START_SIZE));
HexStr(blk_start),
HexStr(message_start));
}
if (blk_size > MAX_SIZE) {