Wrap kernel chainparamsbase functions in kernel namespace

TheCharlatan · Oct 15, 2022 · 03468cb · 03468cb
1 parent 145b36c
commit 03468cb
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git 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
@@ -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=<file>", 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<uint16_t>(gArgs.GetIntArg("-rpcport", port));
 

diff --git 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
@@ -296,7 +296,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<uint16_t>(gArgs.GetIntArg("-rpcport", BaseParams().RPCPort()))};
+    uint16_t http_port{static_cast<uint16_t>(gArgs.GetIntArg("-rpcport", kernel::BaseParams().RPCPort()))};
     std::vector<std::pair<std::string, uint16_t>> endpoints;
 
     // Determine what addresses to bind to

diff --git a/src/init.cpp b/src/init.cpp
@@ -389,10 +389,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);
@@ -1729,7 +1729,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
@@ -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
@@ -37,6 +37,8 @@ class CBaseChainParams
     std::string strDataDir;
 };
 
+namespace kernel {
+
 /**
  * Creates and returns a std::unique_ptr<CBaseChainParams> 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
@@ -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
@@ -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");
         }