mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 03:22:47 +01:00
merge bitcoin#25245: Remove no-op TIME_INIT on deser
This commit is contained in:
parent
2d33cfba41
commit
ea3c727e02
@ -3,10 +3,6 @@
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef __cplusplus
|
||||
#error This header can only be compiled as C++.
|
||||
#endif
|
||||
|
||||
#ifndef BITCOIN_PROTOCOL_H
|
||||
#define BITCOIN_PROTOCOL_H
|
||||
|
||||
@ -15,13 +11,10 @@
|
||||
#include <serialize.h>
|
||||
#include <streams.h>
|
||||
#include <uint256.h>
|
||||
#include <version.h>
|
||||
|
||||
#include <util/expected.h>
|
||||
|
||||
|
||||
#include <cstdint>
|
||||
#include <limits>
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
|
||||
/** Message header.
|
||||
@ -467,7 +460,6 @@ public:
|
||||
use_v2 = s.GetVersion() & ADDRV2_FORMAT;
|
||||
}
|
||||
|
||||
SER_READ(obj, obj.nTime = TIME_INIT);
|
||||
READWRITE(obj.nTime);
|
||||
// nServices is serialized as CompactSize in V2; as uint64_t in V1.
|
||||
if (use_v2) {
|
||||
|
Loading…
Reference in New Issue
Block a user