From 38941a703e079709bb465ad1fcde50e11350f8f1 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 30 Nov 2022 10:37:13 +0000
Subject: [PATCH] refactor: Move `txmempool_entry.h` -->
 `kernel/mempool_entry.h`

---
 src/Makefile.am                                   | 2 +-
 src/bench/mempool_eviction.cpp                    | 2 +-
 src/bench/mempool_stress.cpp                      | 2 +-
 src/bench/rpc_mempool.cpp                         | 2 +-
 src/{txmempool_entry.h => kernel/mempool_entry.h} | 6 +++---
 src/net_processing.cpp                            | 2 +-
 src/node/interfaces.cpp                           | 6 +++---
 src/policy/fees.cpp                               | 2 +-
 src/policy/rbf.cpp                                | 2 +-
 src/rpc/mempool.cpp                               | 2 +-
 src/test/fuzz/policy_estimator.cpp                | 2 +-
 src/test/fuzz/util/mempool.cpp                    | 2 +-
 src/test/fuzz/util/mempool.h                      | 2 +-
 src/test/util/setup_common.cpp                    | 2 +-
 src/txmempool.h                                   | 2 +-
 src/validation.cpp                                | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)
 rename src/{txmempool_entry.h => kernel/mempool_entry.h} (98%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2e2da54b2d..cff194b0fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -177,6 +177,7 @@ BITCOIN_CORE_H = \
   kernel/checks.h \
   kernel/coinstats.h \
   kernel/context.h \
+  kernel/mempool_entry.h \
   kernel/mempool_limits.h \
   kernel/mempool_options.h \
   kernel/mempool_persist.h \
@@ -263,7 +264,6 @@ BITCOIN_CORE_H = \
   torcontrol.h \
   txdb.h \
   txmempool.h \
-  txmempool_entry.h \
   txorphanage.h \
   txrequest.h \
   undo.h \
diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
index 29feb42528..2b133f58f4 100644
--- a/src/bench/mempool_eviction.cpp
+++ b/src/bench/mempool_eviction.cpp
@@ -3,10 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <kernel/mempool_entry.h>
 #include <policy/policy.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 
 
 static void AddTx(const CTransactionRef& tx, const CAmount& nFee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
diff --git a/src/bench/mempool_stress.cpp b/src/bench/mempool_stress.cpp
index 1e40d78aa5..67564508d9 100644
--- a/src/bench/mempool_stress.cpp
+++ b/src/bench/mempool_stress.cpp
@@ -3,10 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <kernel/mempool_entry.h>
 #include <policy/policy.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <validation.h>
 
 #include <vector>
diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp
index 5ae4829d16..6bac6419e5 100644
--- a/src/bench/rpc_mempool.cpp
+++ b/src/bench/rpc_mempool.cpp
@@ -4,10 +4,10 @@
 
 #include <bench/bench.h>
 #include <chainparamsbase.h>
+#include <kernel/mempool_entry.h>
 #include <rpc/mempool.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 
 #include <univalue.h>
 
diff --git a/src/txmempool_entry.h b/src/kernel/mempool_entry.h
similarity index 98%
rename from src/txmempool_entry.h
rename to src/kernel/mempool_entry.h
index dd71833200..e1ba4296ef 100644
--- a/src/txmempool_entry.h
+++ b/src/kernel/mempool_entry.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_TXMEMPOOL_ENTRY_H
-#define BITCOIN_TXMEMPOOL_ENTRY_H
+#ifndef BITCOIN_KERNEL_MEMPOOL_ENTRY_H
+#define BITCOIN_KERNEL_MEMPOOL_ENTRY_H
 
 #include <consensus/amount.h>
 #include <consensus/validation.h>
@@ -171,4 +171,4 @@ public:
     mutable Epoch::Marker m_epoch_marker; //!< epoch when last touched, useful for graph algorithms
 };
 
-#endif // BITCOIN_TXMEMPOOL_ENTRY_H
+#endif // BITCOIN_KERNEL_MEMPOOL_ENTRY_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 346600efd0..8cb186d881 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -16,6 +16,7 @@
 #include <hash.h>
 #include <headerssync.h>
 #include <index/blockfilterindex.h>
+#include <kernel/mempool_entry.h>
 #include <merkleblock.h>
 #include <netbase.h>
 #include <netmessagemaker.h>
@@ -34,7 +35,6 @@
 #include <timedata.h>
 #include <tinyformat.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <txorphanage.h>
 #include <txrequest.h>
 #include <util/check.h> // For NDEBUG compile time check
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 212780b259..c2c9adadbb 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -15,17 +15,18 @@
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
+#include <kernel/chain.h>
+#include <kernel/mempool_entry.h>
 #include <mapport.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <node/blockstorage.h>
-#include <kernel/chain.h>
 #include <node/coin.h>
 #include <node/context.h>
-#include <node/transaction.h>
 #include <node/interface_ui.h>
+#include <node/transaction.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
@@ -39,7 +40,6 @@
 #include <support/allocators/secure.h>
 #include <sync.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <uint256.h>
 #include <univalue.h>
 #include <util/check.h>
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 899adc70ca..1cd9624000 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -8,6 +8,7 @@
 #include <clientversion.h>
 #include <consensus/amount.h>
 #include <fs.h>
+#include <kernel/mempool_entry.h>
 #include <logging.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
@@ -16,7 +17,6 @@
 #include <streams.h>
 #include <sync.h>
 #include <tinyformat.h>
-#include <txmempool_entry.h>
 #include <uint256.h>
 #include <util/serfloat.h>
 #include <util/system.h>
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp
index 994e13dd56..3a347b41ed 100644
--- a/src/policy/rbf.cpp
+++ b/src/policy/rbf.cpp
@@ -5,12 +5,12 @@
 #include <policy/rbf.h>
 
 #include <consensus/amount.h>
+#include <kernel/mempool_entry.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <uint256.h>
 #include <util/moneystr.h>
 #include <util/rbf.h>
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 039a4328e3..7a0c361ae0 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -10,6 +10,7 @@
 #include <chainparams.h>
 #include <core_io.h>
 #include <fs.h>
+#include <kernel/mempool_entry.h>
 #include <node/mempool_persist_args.h>
 #include <policy/rbf.h>
 #include <policy/settings.h>
@@ -18,7 +19,6 @@
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <univalue.h>
 #include <util/moneystr.h>
 #include <util/time.h>
diff --git a/src/test/fuzz/policy_estimator.cpp b/src/test/fuzz/policy_estimator.cpp
index 3788c36455..17c340695f 100644
--- a/src/test/fuzz/policy_estimator.cpp
+++ b/src/test/fuzz/policy_estimator.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <kernel/mempool_entry.h>
 #include <policy/fees.h>
 #include <policy/fees_args.h>
 #include <primitives/transaction.h>
@@ -11,7 +12,6 @@
 #include <test/fuzz/util/mempool.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 
 #include <cstdint>
 #include <optional>
diff --git a/src/test/fuzz/util/mempool.cpp b/src/test/fuzz/util/mempool.cpp
index c6a6943603..4baca5ec77 100644
--- a/src/test/fuzz/util/mempool.cpp
+++ b/src/test/fuzz/util/mempool.cpp
@@ -4,11 +4,11 @@
 
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
+#include <kernel/mempool_entry.h>
 #include <primitives/transaction.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/mempool.h>
-#include <txmempool_entry.h>
 
 #include <cassert>
 #include <cstdint>
diff --git a/src/test/fuzz/util/mempool.h b/src/test/fuzz/util/mempool.h
index ada657d970..31b578dc4b 100644
--- a/src/test/fuzz/util/mempool.h
+++ b/src/test/fuzz/util/mempool.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_TEST_FUZZ_UTIL_MEMPOOL_H
 #define BITCOIN_TEST_FUZZ_UTIL_MEMPOOL_H
 
-#include <txmempool_entry.h>
+#include <kernel/mempool_entry.h>
 #include <validation.h>
 
 class CTransaction;
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index a7ca97222a..c97f400137 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <init/common.h>
 #include <interfaces/chain.h>
+#include <kernel/mempool_entry.h>
 #include <net.h>
 #include <net_processing.h>
 #include <node/blockstorage.h>
@@ -41,7 +42,6 @@
 #include <timedata.h>
 #include <txdb.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/thread.h>
diff --git a/src/txmempool.h b/src/txmempool.h
index d48327e5dc..dd28a84c23 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -20,12 +20,12 @@
 #include <coins.h>
 #include <consensus/amount.h>
 #include <indirectmap.h>
+#include <kernel/mempool_entry.h>
 #include <policy/feerate.h>
 #include <policy/packages.h>
 #include <primitives/transaction.h>
 #include <random.h>
 #include <sync.h>
-#include <txmempool_entry.h>
 #include <util/epochguard.h>
 #include <util/hasher.h>
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 1cf6fc0675..5670450afe 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -22,6 +22,7 @@
 #include <flatfile.h>
 #include <fs.h>
 #include <hash.h>
+#include <kernel/mempool_entry.h>
 #include <logging.h>
 #include <logging/timer.h>
 #include <node/blockstorage.h>
@@ -42,7 +43,6 @@
 #include <tinyformat.h>
 #include <txdb.h>
 #include <txmempool.h>
-#include <txmempool_entry.h>
 #include <uint256.h>
 #include <undo.h>
 #include <util/check.h> // For NDEBUG compile time check