From e965620c2812671f6122f3cc10f13aa2d6ff0ca0 Mon Sep 17 00:00:00 2001 From: TheCharlatan Date: Sat, 24 Sep 2022 16:20:44 +0200 Subject: [PATCH] Wrap kernel chainparamsbase functions in kernel namespace --- src/bitcoin-chainstate.cpp | 2 +- src/bitcoin-cli.cpp | 10 +++++----- src/chainparamsbase.cpp | 2 +- src/httpserver.cpp | 2 +- src/init.cpp | 10 +++++----- src/kernel/chainparamsbase.cpp | 4 ++++ src/kernel/chainparamsbase.h | 3 +++ src/torcontrol.cpp | 2 +- src/util/system.cpp | 6 +++--- 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp index 4af4b6b05bdc16..26b0f5e10fe119 100644 --- a/src/bitcoin-chainstate.cpp +++ b/src/bitcoin-chainstate.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) // SETUP: Misc Globals - SetGlobalBaseParams(CBaseChainParams::MAIN); + kernel::SetGlobalBaseParams(CBaseChainParams::MAIN); auto chainparams_ptr = CChainParams::Main(); const CChainParams& chainparams = *chainparams_ptr; diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 55fa3116ac2057..b62540cbcae0ae 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -67,10 +67,10 @@ static void SetupCliArgs(ArgsManager& argsman) { SetupHelpOptions(argsman); - const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN); - const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); - const auto signetBaseParams = CreateBaseChainParams(CBaseChainParams::SIGNET); - const auto regtestBaseParams = CreateBaseChainParams(CBaseChainParams::REGTEST); + const auto defaultBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::MAIN); + const auto testnetBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::TESTNET); + const auto signetBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::SIGNET); + const auto regtestBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::REGTEST); argsman.AddArg("-version", "Print version and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-conf=", strprintf("Specify configuration file. Relative paths will be prefixed by datadir location. (default: %s)", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); @@ -721,7 +721,7 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co // 1. -rpcport // 2. port in -rpcconnect (ie following : in ipv4 or ]: in ipv6) // 3. default port for chain - uint16_t port{BaseParams().RPCPort()}; + uint16_t port{kernel::BaseParams().RPCPort()}; SplitHostPort(gArgs.GetArg("-rpcconnect", DEFAULT_RPCCONNECT), port, host); port = static_cast(gArgs.GetIntArg("-rpcport", port)); diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 9c08f2e2d2b479..b18ac25f22f6f6 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -25,6 +25,6 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman) void SelectBaseParams(const std::string& chain) { - SetGlobalBaseParams(chain); + kernel::SetGlobalBaseParams(chain); gArgs.SelectConfigNetwork(chain); } diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 6f84d5c83bd704..3ce5d5e2567324 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -293,7 +293,7 @@ static bool ThreadHTTP(struct event_base* base) /** Bind HTTP server to specified addresses */ static bool HTTPBindAddresses(struct evhttp* http) { - uint16_t http_port{static_cast(gArgs.GetIntArg("-rpcport", BaseParams().RPCPort()))}; + uint16_t http_port{static_cast(gArgs.GetIntArg("-rpcport", kernel::BaseParams().RPCPort()))}; std::vector> endpoints; // Determine what addresses to bind to diff --git a/src/init.cpp b/src/init.cpp index f31a45aa9f283f..7c6ea1043a41fc 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -390,10 +390,10 @@ void SetupServerArgs(ArgsManager& argsman) init::AddLoggingArgs(argsman); - const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN); - const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); - const auto signetBaseParams = CreateBaseChainParams(CBaseChainParams::SIGNET); - const auto regtestBaseParams = CreateBaseChainParams(CBaseChainParams::REGTEST); + const auto defaultBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::MAIN); + const auto testnetBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::TESTNET); + const auto signetBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::SIGNET); + const auto regtestBaseParams = kernel::CreateBaseChainParams(CBaseChainParams::REGTEST); const auto defaultChainParams = CreateChainParams(argsman, CBaseChainParams::MAIN); const auto testnetChainParams = CreateChainParams(argsman, CBaseChainParams::TESTNET); const auto signetChainParams = CreateChainParams(argsman, CBaseChainParams::SIGNET); @@ -1743,7 +1743,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) const std::string network_type = bind_arg.substr(index + 1); if (network_type == "onion") { const std::string truncated_bind_arg = bind_arg.substr(0, index); - if (Lookup(truncated_bind_arg, bind_addr, BaseParams().OnionServiceTargetPort(), false)) { + if (Lookup(truncated_bind_arg, bind_addr, kernel::BaseParams().OnionServiceTargetPort(), false)) { connOptions.onion_binds.push_back(bind_addr); continue; } diff --git a/src/kernel/chainparamsbase.cpp b/src/kernel/chainparamsbase.cpp index c5f83262343a75..78452f6b128f21 100644 --- a/src/kernel/chainparamsbase.cpp +++ b/src/kernel/chainparamsbase.cpp @@ -11,6 +11,8 @@ const std::string CBaseChainParams::TESTNET = "test"; const std::string CBaseChainParams::SIGNET = "signet"; const std::string CBaseChainParams::REGTEST = "regtest"; +namespace kernel { + /** * Port numbers for incoming Tor connections (8334, 18334, 38334, 18445) have * been chosen arbitrarily to keep ranges of used ports tight. @@ -41,3 +43,5 @@ const CBaseChainParams& BaseParams() assert(globalChainBaseParams); return *globalChainBaseParams; } + +} // namespace kernel diff --git a/src/kernel/chainparamsbase.h b/src/kernel/chainparamsbase.h index 10bb68f92eadc8..3e37e45f214052 100644 --- a/src/kernel/chainparamsbase.h +++ b/src/kernel/chainparamsbase.h @@ -37,6 +37,8 @@ class CBaseChainParams std::string strDataDir; }; +namespace kernel { + /** * Creates and returns a std::unique_ptr of the chosen chain. * @returns a CBaseChainParams* of the chosen chain. @@ -54,5 +56,6 @@ void SetGlobalBaseParams(const std::string& chain); * startup, except for unit tests. */ const CBaseChainParams& BaseParams(); +} // namespace kernel #endif // BITCOIN_KERNEL_CHAINPARAMSBASE_H diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 3a21a79a345290..69bf46d2e10ce1 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -700,5 +700,5 @@ CService DefaultOnionServiceTarget() { struct in_addr onion_service_target; onion_service_target.s_addr = htonl(INADDR_LOOPBACK); - return {onion_service_target, BaseParams().OnionServiceTargetPort()}; + return {onion_service_target, kernel::BaseParams().OnionServiceTargetPort()}; } diff --git a/src/util/system.cpp b/src/util/system.cpp index d7a0793ea8f94f..fa5ff6c4209552 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -406,7 +406,7 @@ const fs::path& ArgsManager::GetBlocksDirPath() const path = GetDataDirBase(); } - path /= fs::PathFromString(BaseParams().DataDir()); + path /= fs::PathFromString(kernel::BaseParams().DataDir()); path /= "blocks"; fs::create_directories(path); return path; @@ -436,8 +436,8 @@ const fs::path& ArgsManager::GetDataDir(bool net_specific) const fs::create_directories(path / "wallets"); } - if (net_specific && !BaseParams().DataDir().empty()) { - path /= fs::PathFromString(BaseParams().DataDir()); + if (net_specific && !kernel::BaseParams().DataDir().empty()) { + path /= fs::PathFromString(kernel::BaseParams().DataDir()); if (!fs::exists(path)) { fs::create_directories(path / "wallets"); }