diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-04-07 14:34:01 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-05-30 13:55:39 +0200 |
| commit | fa243e93138d899f41be02af3fa2b029dd8d525e (patch) | |
| tree | 23c151839957d4e87c26f23c99952f5dcb474b18 /src/protocol.h | |
| parent | 8779adbdda7658d109556d2e3397e59869a4532a (diff) | |
Remove no-op TIME_INIT on deser
Assigning TIME_INIT to nTime was needed to fully re-initialize a dirty
object where the deserialization might skip nTime.
See https://github.com/bitcoin/bitcoin/pull/19020/files#r427620111
Now that the without-nTime logic is removed in commit
dbcb5742c48fd26f77e500291d7083e12eec741b and commit
e08770bed187bfa66f525d42e484579bcea78bba, the logic here can be removed
as well.
Also, remove confusing and redundant preprocessor code.
Also, remove no longer needed version.h include, which was needed for
INIT_PROTO_VERSION.
Diffstat (limited to 'src/protocol.h')
| -rw-r--r-- | src/protocol.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/protocol.h b/src/protocol.h index fdeaa9a9c5..da2d24aff3 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -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,10 +11,9 @@ #include <serialize.h> #include <streams.h> #include <uint256.h> -#include <version.h> +#include <cstdint> #include <limits> -#include <stdint.h> #include <string> /** Message header. @@ -420,7 +415,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) { |