aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/main.h b/src/main.h
index db41584b56..9dbcac0b5a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -814,22 +814,12 @@ public:
uint256 hashChecksum;
try {
filein >> *this;
+ filein >> hashChecksum;
}
catch (std::exception &e) {
return error("%s() : deserialize or I/O error", __PRETTY_FUNCTION__);
}
- // for compatibility with pre-release code that didn't write checksums to undo data
- // TODO: replace by a simply 'filein >> hashChecksum' in the above try block
- try {
- filein >> hashChecksum;
- } catch (std::exception &e) {
- hashChecksum = 0;
- }
- uint32_t hashInit = hashChecksum.Get64(0) & 0xFFFFFFFFUL;
- if (hashChecksum == 0 || memcmp(&hashInit, pchMessageStart, 4) == 0)
- return true;
-
// Verify checksum
CHashWriter hasher(SER_GETHASH, PROTOCOL_VERSION);
hasher << hashBlock;