diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-07-07 10:43:24 +0100 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-10-03 10:52:17 +0100 |
| commit | 5b3ea5fa2e7f6dc1c9161ed8b74c9be4bd1e92dd (patch) | |
| tree | 6fd3db67d9fb06ee3a9ae5bef9fd89e9e4edb652 | |
| parent | 6e17b3168072ab77ed7170ab81327c017877133a (diff) | |
| download | bitcoin-5b3ea5fa2e7f6dc1c9161ed8b74c9be4bd1e92dd.tar.xz | |
refactor: Move `{MAX,DEFAULT}_SCRIPTCHECK_THREADS` constants
| -rw-r--r-- | src/node/chainstatemanager_args.cpp | 1 | ||||
| -rw-r--r-- | src/node/chainstatemanager_args.h | 5 | ||||
| -rw-r--r-- | src/qt/optionsdialog.cpp | 2 | ||||
| -rw-r--r-- | src/qt/optionsmodel.cpp | 1 | ||||
| -rw-r--r-- | 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 e61deca3ec..1cc126cb05 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 701515953e..b2cdba68b8 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 512fce473d..6e1d36effb 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 c1563fe1e2..43564dad16 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 aacc9b828f..1165511ead 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; |