From 5b3ea5fa2e7f6dc1c9161ed8b74c9be4bd1e92dd Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:43:24 +0100
Subject: [PATCH] refactor: Move `{MAX,DEFAULT}_SCRIPTCHECK_THREADS` constants

---
 src/node/chainstatemanager_args.cpp | 1 -
 src/node/chainstatemanager_args.h   | 5 +++++
 src/qt/optionsdialog.cpp            | 2 +-
 src/qt/optionsmodel.cpp             | 1 +
 src/validation.h                    | 4 ----
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/node/chainstatemanager_args.cpp b/src/node/chainstatemanager_args.cpp
index e61deca3ec3..1cc126cb051 100644
--- a/src/node/chainstatemanager_args.cpp
+++ b/src/node/chainstatemanager_args.cpp
@@ -7,7 +7,6 @@
 #include <arith_uint256.h>
 #include <common/args.h>
 #include <common/system.h>
-#include <kernel/chainstatemanager_opts.h>
 #include <logging.h>
 #include <node/coins_view_args.h>
 #include <node/database_args.h>
diff --git a/src/node/chainstatemanager_args.h b/src/node/chainstatemanager_args.h
index 701515953e8..b2cdba68b8f 100644
--- a/src/node/chainstatemanager_args.h
+++ b/src/node/chainstatemanager_args.h
@@ -10,6 +10,11 @@
 
 class ArgsManager;
 
+/** Maximum number of dedicated script-checking threads allowed */
+static constexpr int MAX_SCRIPTCHECK_THREADS{15};
+/** -par default (number of script-checking threads, 0 = auto) */
+static constexpr int DEFAULT_SCRIPTCHECK_THREADS{0};
+
 namespace node {
 [[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
 } // namespace node
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 512fce473d2..6e1d36effbe 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -17,9 +17,9 @@
 
 #include <common/system.h>
 #include <interfaces/node.h>
+#include <node/chainstatemanager_args.h>
 #include <netbase.h>
 #include <txdb.h>
-#include <validation.h>
 
 #include <chrono>
 
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index c1563fe1e27..43564dad167 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -17,6 +17,7 @@
 #include <mapport.h>
 #include <net.h>
 #include <netbase.h>
+#include <node/chainstatemanager_args.h>
 #include <txdb.h> // for -dbcache defaults
 #include <util/string.h>
 #include <validation.h>    // For DEFAULT_SCRIPTCHECK_THREADS
diff --git a/src/validation.h b/src/validation.h
index aacc9b828f8..1165511ead5 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -66,10 +66,6 @@ namespace util {
 class SignalInterrupt;
 } // namespace util
 
-/** Maximum number of dedicated script-checking threads allowed */
-static const int MAX_SCRIPTCHECK_THREADS = 15;
-/** -par default (number of script-checking threads, 0 = auto) */
-static const int DEFAULT_SCRIPTCHECK_THREADS = 0;
 /** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of ActiveChain().Tip() will not be pruned. */
 static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
 static const signed int DEFAULT_CHECKBLOCKS = 6;