Merge bitcoin#28451: refactor: Remove unused SER_DISK, SER_NETWORK, C…

…DataStream fa98a09 Rename version.h to node/protocol_version.h (MarcoFalke) fa4fbd5 Remove unused version.h include (MarcoFalke) fa0ae22 Remove unused SER_NETWORK, SER_DISK (MarcoFalke) fae00fe Remove unused CDataStream (MarcoFalke) fa7eb4f fuzz: Drop unused version from fuzz input format (MarcoFalke) Pull request description: Seems odd to have code that is completely dead. Fix this by removing all of it. ACKs for top commit: sipa: utACK fa98a09 ajtowns: ACK fa98a09 ryanofsky: Seems odd to not code review ACK fa98a09 (looks good) Tree-SHA512: 9f1b9d9f92bda0512610bda6653e892756f637860362a9abfa439faab62de233cbad94b7df78ebacc160d9667aadfed4d9df08c0edefa618c040a049050fb913
pochingchen · Nov 30, 2023 · ffb0216 · ffb0216
2 parents cdb7723 + fa98a09
commit ffb0216
Show file tree

Hide file tree

Showing 38 changed files with 69 additions and 138 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -230,6 +230,7 @@ BITCOIN_CORE_H = \
   node/mini_miner.h \
   node/minisketchwrapper.h \
   node/peerman_args.h \
+  node/protocol_version.h \
   node/psbt.h \
   node/transaction.h \
   node/txreconciliation.h \
@@ -658,8 +659,7 @@ libbitcoin_consensus_a_SOURCES = \
   uint256.cpp \
   uint256.h \
   util/strencodings.cpp \
-  util/strencodings.h \
-  version.h
+  util/strencodings.h
 #
 
 # common #

diff --git a/src/bench/rpc_blockchain.cpp b/src/bench/rpc_blockchain.cpp
@@ -23,7 +23,7 @@ struct TestBlockAndIndex {
 
     TestBlockAndIndex()
     {
-        CDataStream stream(benchmark::data::block413567, SER_NETWORK, PROTOCOL_VERSION);
+        DataStream stream{benchmark::data::block413567};
         std::byte a{0};
         stream.write({&a, 1}); // Prevent compaction
 

diff --git a/src/external_signer.cpp b/src/external_signer.cpp
@@ -9,7 +9,6 @@
 #include <core_io.h>
 #include <psbt.h>
 #include <util/strencodings.h>
-#include <version.h>
 
 #include <algorithm>
 #include <stdexcept>

diff --git a/src/net.h b/src/net.h
@@ -20,6 +20,7 @@
 #include <netbase.h>
 #include <netgroup.h>
 #include <node/connection_types.h>
+#include <node/protocol_version.h>
 #include <policy/feerate.h>
 #include <protocol.h>
 #include <random.h>
@@ -30,7 +31,6 @@
 #include <util/check.h>
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
-#include <version.h>
 
 #include <atomic>
 #include <condition_variable>

diff --git a/src/version.h → src/node/protocol_version.h b/src/version.h → src/node/protocol_version.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012-2020 The Bitcoin Core developers
+// Copyright (c) 2012-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_VERSION_H
-#define BITCOIN_VERSION_H
+#ifndef BITCOIN_NODE_PROTOCOL_VERSION_H
+#define BITCOIN_NODE_PROTOCOL_VERSION_H
 
 /**
  * network protocol versioning
@@ -35,4 +35,4 @@ static const int INVALID_CB_NO_BAN_VERSION = 70015;
 //! "wtxidrelay" command for wtxid-based relay starts with this version
 static const int WTXID_RELAY_VERSION = 70016;
 
-#endif // BITCOIN_VERSION_H
+#endif // BITCOIN_NODE_PROTOCOL_VERSION_H
diff --git a/src/psbt.cpp b/src/psbt.cpp
@@ -8,7 +8,6 @@
 #include <script/signingprovider.h>
 #include <util/check.h>
 #include <util/strencodings.h>
-#include <version.h>
 
 
 PartiallySignedTransaction::PartiallySignedTransaction(const CMutableTransaction& tx) : tx(tx)
@@ -546,7 +545,7 @@ bool DecodeBase64PSBT(PartiallySignedTransaction& psbt, const std::string& base6
 
 bool DecodeRawPSBT(PartiallySignedTransaction& psbt, Span<const std::byte> tx_data, std::string& error)
 {
-    CDataStream ss_data(tx_data, SER_NETWORK, PROTOCOL_VERSION);
+    DataStream ss_data{tx_data};
     try {
         ss_data >> psbt;
         if (!ss_data.empty()) {

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -15,6 +15,7 @@
 #include <net_types.h> // For banmap_t
 #include <netbase.h>
 #include <node/context.h>
+#include <node/protocol_version.h>
 #include <policy/settings.h>
 #include <protocol.h>
 #include <rpc/blockchain.h>
@@ -29,7 +30,6 @@
 #include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
-#include <version.h>
 #include <warnings.h>
 
 #include <optional>

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -40,7 +40,6 @@
 #include <util/vector.h>
 #include <validation.h>
 #include <validationinterface.h>
-#include <version.h>
 
 #include <numeric>
 #include <stdint.h>

diff --git a/src/serialize.h b/src/serialize.h
@@ -117,21 +117,8 @@ template<typename Stream> inline uint64_t ser_readdata64(Stream &s)
 }
 
 
-/////////////////////////////////////////////////////////////////
-//
-// Templates for serializing to anything that looks like a stream,
-// i.e. anything that supports .read(Span<std::byte>) and .write(Span<const std::byte>)
-//
-
 class SizeComputer;
 
-enum
-{
-    // primary actions
-    SER_NETWORK         = (1 << 0),
-    SER_DISK            = (1 << 1),
-};
-
 /**
  * Convert any argument to a reference to X, maintaining constness.
  *
@@ -268,6 +255,9 @@ const Out& AsBase(const In& x)
     BASE_SERIALIZE_METHODS(cls)                                \
     FORMATTER_METHODS_PARAMS(cls, obj, paramcls, paramobj)
 
+// Templates for serializing to anything that looks like a stream,
+// i.e. anything that supports .read(Span<std::byte>) and .write(Span<const std::byte>)
+//
 // clang-format off
 #ifndef CHAR_EQUALS_INT8
 template <typename Stream> void Serialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t

diff --git a/src/streams.h b/src/streams.h
@@ -279,42 +279,6 @@ class DataStream
     }
 };
 
-class CDataStream : public DataStream
-{
-private:
-    int nType;
-    int nVersion;
-
-public:
-    explicit CDataStream(int nTypeIn, int nVersionIn)
-        : nType{nTypeIn},
-          nVersion{nVersionIn} {}
-
-    explicit CDataStream(Span<const uint8_t> sp, int type, int version) : CDataStream{AsBytes(sp), type, version} {}
-    explicit CDataStream(Span<const value_type> sp, int nTypeIn, int nVersionIn)
-        : DataStream{sp},
-          nType{nTypeIn},
-          nVersion{nVersionIn} {}
-
-    int GetType() const          { return nType; }
-    void SetVersion(int n)       { nVersion = n; }
-    int GetVersion() const       { return nVersion; }
-
-    template <typename T>
-    CDataStream& operator<<(const T& obj)
-    {
-        ::Serialize(*this, obj);
-        return *this;
-    }
-
-    template <typename T>
-    CDataStream& operator>>(T&& obj)
-    {
-        ::Unserialize(*this, obj);
-        return *this;
-    }
-};
-
 template <typename IStream>
 class BitStreamReader
 {