From fa98a097a30bc39f2424c0efd28a7979155faae6 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Tue, 28 Nov 2023 17:56:26 +0100
Subject: [PATCH] Rename version.h to node/protocol_version.h

---
 src/Makefile.am                            | 4 ++--
 src/net.h                                  | 2 +-
 src/{version.h => node/protocol_version.h} | 8 ++++----
 src/rpc/net.cpp                            | 2 +-
 src/test/fuzz/util/net.cpp                 | 2 +-
 src/test/net_peer_connection_tests.cpp     | 2 +-
 src/test/net_tests.cpp                     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{version.h => node/protocol_version.h} (86%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 99b2184cf2..27f947d7a5 100644
--- 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/net.h b/src/net.h
index 4347bf12ca..28f304b062 100644
--- 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 b/src/node/protocol_version.h
similarity index 86%
rename from src/version.h
rename to src/node/protocol_version.h
index c2ebeecbfb..43c1bf6c5b 100644
--- a/src/version.h
+++ b/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/rpc/net.cpp b/src/rpc/net.cpp
index c631132df2..5fea8c22c9 100644
--- 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/test/fuzz/util/net.cpp b/src/test/fuzz/util/net.cpp
index 5a286c05d2..eb0f14ede0 100644
--- a/src/test/fuzz/util/net.cpp
+++ b/src/test/fuzz/util/net.cpp
@@ -6,13 +6,13 @@
 
 #include <compat/compat.h>
 #include <netaddress.h>
+#include <node/protocol_version.h>
 #include <protocol.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/util.h>
 #include <test/util/net.h>
 #include <util/sock.h>
 #include <util/time.h>
-#include <version.h>
 
 #include <array>
 #include <cassert>
diff --git a/src/test/net_peer_connection_tests.cpp b/src/test/net_peer_connection_tests.cpp
index 0300c17e40..58cbe9eb72 100644
--- a/src/test/net_peer_connection_tests.cpp
+++ b/src/test/net_peer_connection_tests.cpp
@@ -10,6 +10,7 @@
 #include <netbase.h>
 #include <netgroup.h>
 #include <node/connection_types.h>
+#include <node/protocol_version.h>
 #include <protocol.h>
 #include <random.h>
 #include <test/util/logging.h>
@@ -18,7 +19,6 @@
 #include <test/util/setup_common.h>
 #include <tinyformat.h>
 #include <util/chaintype.h>
-#include <version.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 0274ccaba1..70a8279f04 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -12,6 +12,7 @@
 #include <netaddress.h>
 #include <netbase.h>
 #include <netmessagemaker.h>
+#include <node/protocol_version.h>
 #include <serialize.h>
 #include <span.h>
 #include <streams.h>
@@ -22,7 +23,6 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <validation.h>
-#include <version.h>
 
 #include <boost/test/unit_test.hpp>