From 85dce07e3bcced31051e1541c8d9f408dcadbac9 Mon Sep 17 00:00:00 2001
From: ismaelsadeeq <ask4ismailsadiq@gmail.com>
Date: Thu, 9 Jan 2025 17:31:05 -0500
Subject: [PATCH] fees: refactor: rename fees to block_policy_estimator

- Also move it to policy/fees and update the includes
- Note: the block_policy_estimator.h include in block_policy_estimator.cpp was done manually.
---
 src/CMakeLists.txt                                       | 2 +-
 src/common/messages.cpp                                  | 2 +-
 src/init.cpp                                             | 3 ++-
 src/net_processing.cpp                                   | 2 +-
 src/node/context.cpp                                     | 2 +-
 src/node/interfaces.cpp                                  | 3 ++-
 src/policy/{fees.cpp => fees/block_policy_estimator.cpp} | 2 +-
 src/policy/{fees.h => fees/block_policy_estimator.h}     | 6 +++---
 src/qt/sendcoinsdialog.cpp                               | 2 +-
 src/rpc/fees.cpp                                         | 2 +-
 src/rpc/server_util.cpp                                  | 3 ++-
 src/test/feerounder_tests.cpp                            | 2 +-
 src/test/fuzz/fees.cpp                                   | 2 +-
 src/test/fuzz/kitchen_sink.cpp                           | 2 +-
 src/test/fuzz/policy_estimator.cpp                       | 2 +-
 src/test/fuzz/policy_estimator_io.cpp                    | 2 +-
 src/test/policyestimator_tests.cpp                       | 2 +-
 src/test/util/setup_common.cpp                           | 2 +-
 src/wallet/coincontrol.h                                 | 2 +-
 src/wallet/feebumper.cpp                                 | 2 +-
 src/wallet/interfaces.cpp                                | 2 +-
 src/wallet/spend.h                                       | 2 +-
 src/wallet/test/spend_tests.cpp                          | 2 +-
 23 files changed, 28 insertions(+), 25 deletions(-)
 rename src/policy/{fees.cpp => fees/block_policy_estimator.cpp} (99%)
 rename src/policy/{fees.h => fees/block_policy_estimator.h} (98%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e06f0dd0693..18fc303ed62 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -257,7 +257,7 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   node/warnings.cpp
   noui.cpp
   policy/ephemeral_policy.cpp
-  policy/fees.cpp
+  policy/fees/block_policy_estimator.cpp
   policy/fees_args.cpp
   policy/fees/forecaster_man.cpp
   policy/packages.cpp
diff --git a/src/common/messages.cpp b/src/common/messages.cpp
index 5fe3e9e4d86..c08889f125b 100644
--- a/src/common/messages.cpp
+++ b/src/common/messages.cpp
@@ -6,7 +6,7 @@
 #include <common/messages.h>
 
 #include <common/types.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <node/types.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
diff --git a/src/init.cpp b/src/init.cpp
index 1f597cb7cb2..52c71b56843 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -56,7 +56,8 @@
 #include <node/miner.h>
 #include <node/peerman_args.h>
 #include <policy/feerate.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
+#include <policy/fees/forecaster_man.h>
 #include <policy/fees_args.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index def758b9157..c8454816f01 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -27,7 +27,7 @@
 #include <node/txdownloadman.h>
 #include <node/txreconciliation.h>
 #include <node/warnings.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
 #include <primitives/block.h>
diff --git a/src/node/context.cpp b/src/node/context.cpp
index 75dfaee866d..bfec54bc0f5 100644
--- a/src/node/context.cpp
+++ b/src/node/context.cpp
@@ -15,7 +15,7 @@
 #include <netgroup.h>
 #include <node/kernel_notifications.h>
 #include <node/warnings.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <scheduler.h>
 #include <txmempool.h>
 #include <validation.h>
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index fe88a6dad11..0edf01d4c92 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -40,7 +40,8 @@
 #include <node/types.h>
 #include <node/warnings.h>
 #include <policy/feerate.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
+#include <policy/fees/forecaster_man.h>
 #include <policy/policy.h>
 #include <policy/rbf.h>
 #include <policy/settings.h>
diff --git a/src/policy/fees.cpp b/src/policy/fees/block_policy_estimator.cpp
similarity index 99%
rename from src/policy/fees.cpp
rename to src/policy/fees/block_policy_estimator.cpp
index e85b2f2caaa..d23dae672cd 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees/block_policy_estimator.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 
 #include <common/system.h>
 #include <consensus/amount.h>
diff --git a/src/policy/fees.h b/src/policy/fees/block_policy_estimator.h
similarity index 98%
rename from src/policy/fees.h
rename to src/policy/fees/block_policy_estimator.h
index a95cc19dd45..394a1d7f885 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees/block_policy_estimator.h
@@ -2,8 +2,8 @@
 // Copyright (c) 2009-2022 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_POLICY_FEES_H
-#define BITCOIN_POLICY_FEES_H
+#ifndef BITCOIN_POLICY_FEES_BLOCK_POLICY_ESTIMATOR_H
+#define BITCOIN_POLICY_FEES_BLOCK_POLICY_ESTIMATOR_H
 
 #include <consensus/amount.h>
 #include <policy/feerate.h>
@@ -342,4 +342,4 @@ private:
     FastRandomContext& insecure_rand GUARDED_BY(m_insecure_rand_mutex);
 };
 
-#endif // BITCOIN_POLICY_FEES_H
+#endif // BITCOIN_POLICY_FEES_BLOCK_POLICY_ESTIMATOR_H
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 0ee1b359fa9..d079cf76df2 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -21,7 +21,7 @@
 #include <key_io.h>
 #include <node/interface_ui.h>
 #include <node/types.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <txmempool.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
diff --git a/src/rpc/fees.cpp b/src/rpc/fees.cpp
index 10caa9ed2ec..f5dae48bd29 100644
--- a/src/rpc/fees.cpp
+++ b/src/rpc/fees.cpp
@@ -7,7 +7,7 @@
 #include <core_io.h>
 #include <node/context.h>
 #include <policy/feerate.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <rpc/protocol.h>
 #include <rpc/request.h>
 #include <rpc/server.h>
diff --git a/src/rpc/server_util.cpp b/src/rpc/server_util.cpp
index 0edd7527a95..4ad99499d46 100644
--- a/src/rpc/server_util.cpp
+++ b/src/rpc/server_util.cpp
@@ -9,7 +9,8 @@
 #include <net_processing.h>
 #include <node/context.h>
 #include <node/miner.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
+#include <policy/fees/forecaster_man.h>
 #include <pow.h>
 #include <rpc/protocol.h>
 #include <rpc/request.h>
diff --git a/src/test/feerounder_tests.cpp b/src/test/feerounder_tests.cpp
index 400437e65ec..3fbbec226d4 100644
--- a/src/test/feerounder_tests.cpp
+++ b/src/test/feerounder_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/amount.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/fuzz/fees.cpp b/src/test/fuzz/fees.cpp
index 5c760be13d8..861168ff6ad 100644
--- a/src/test/fuzz/fees.cpp
+++ b/src/test/fuzz/fees.cpp
@@ -4,7 +4,7 @@
 
 #include <common/messages.h>
 #include <consensus/amount.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
diff --git a/src/test/fuzz/kitchen_sink.cpp b/src/test/fuzz/kitchen_sink.cpp
index 62b49106cdd..2ff0841ac7c 100644
--- a/src/test/fuzz/kitchen_sink.cpp
+++ b/src/test/fuzz/kitchen_sink.cpp
@@ -5,7 +5,7 @@
 #include <common/messages.h>
 #include <merkleblock.h>
 #include <node/types.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <rpc/util.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
diff --git a/src/test/fuzz/policy_estimator.cpp b/src/test/fuzz/policy_estimator.cpp
index 29427403952..699b72beeaf 100644
--- a/src/test/fuzz/policy_estimator.cpp
+++ b/src/test/fuzz/policy_estimator.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <kernel/mempool_entry.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <policy/fees_args.h>
 #include <primitives/transaction.h>
 #include <streams.h>
diff --git a/src/test/fuzz/policy_estimator_io.cpp b/src/test/fuzz/policy_estimator_io.cpp
index 3e7d0933439..2a50b6da8bb 100644
--- a/src/test/fuzz/policy_estimator_io.cpp
+++ b/src/test/fuzz/policy_estimator_io.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <policy/fees_args.h>
 #include <streams.h>
 #include <test/fuzz/FuzzedDataProvider.h>
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index f767cd42871..945cc7519e2 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <policy/fees_args.h>
 #include <policy/policy.h>
 #include <test/util/txmempool.h>
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 970e1a917cb..a1f7355f43d 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -28,7 +28,7 @@
 #include <node/peerman_args.h>
 #include <node/warnings.h>
 #include <noui.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <pow.h>
 #include <random.h>
 #include <rpc/blockchain.h>
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index d36314312ad..55eb792f4e4 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -7,7 +7,7 @@
 
 #include <outputtype.h>
 #include <policy/feerate.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <primitives/transaction.h>
 #include <script/keyorigin.h>
 #include <script/signingprovider.h>
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
index b875461c9f2..c9f11b3fb57 100644
--- a/src/wallet/feebumper.cpp
+++ b/src/wallet/feebumper.cpp
@@ -6,7 +6,7 @@
 #include <consensus/validation.h>
 #include <interfaces/chain.h>
 #include <node/types.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <policy/policy.h>
 #include <util/moneystr.h>
 #include <util/rbf.h>
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 21e8a0b3bd2..43954409125 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -9,7 +9,7 @@
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
 #include <node/types.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <primitives/transaction.h>
 #include <rpc/server.h>
 #include <scheduler.h>
diff --git a/src/wallet/spend.h b/src/wallet/spend.h
index 62a7b4e4c89..a862c573862 100644
--- a/src/wallet/spend.h
+++ b/src/wallet/spend.h
@@ -6,7 +6,7 @@
 #define BITCOIN_WALLET_SPEND_H
 
 #include <consensus/amount.h>
-#include <policy/fees.h> // for FeeCalculation
+#include <policy/fees/block_policy_estimator.h> // for FeeCalculation
 #include <util/result.h>
 #include <wallet/coinselection.h>
 #include <wallet/transaction.h>
diff --git a/src/wallet/test/spend_tests.cpp b/src/wallet/test/spend_tests.cpp
index 963c0f838b1..1302fc0bde0 100644
--- a/src/wallet/test/spend_tests.cpp
+++ b/src/wallet/test/spend_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/amount.h>
-#include <policy/fees.h>
+#include <policy/fees/block_policy_estimator.h>
 #include <script/solver.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>