util: Move util/string.h functions to util namespace

There are no changes to behavior. Changes in this commit are all additions, and
are easiest to review using "git diff -U0 --word-diff-regex=." options.

Motivation for this change is to keep util functions with really generic names
like "Split" and "Join" out of the global namespace so it is easier to see
where these functions are defined, and so they don't interfere with function
overloading, especially since the util library is a dependency of the kernel
library and intended to be used with external code.

src/base58.cpp

@@ -14,6 +14,8 @@
 
 #include <limits>
 
+using util::ContainsNoNUL;
+
 /** All alphanumeric characters except for "0", "I", "O", and "l" */
 static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 static const int8_t mapBase58[256] = {

src/bench/bench.cpp

@@ -18,6 +18,7 @@
 #include <vector>
 
 using namespace std::chrono_literals;
+using util::Join;
 
 const std::function<void(const std::string&)> G_TEST_LOG_FUN{};
 

src/bench/bench_bitcoin.cpp

@@ -16,6 +16,8 @@
 #include <sstream>
 #include <vector>
 
+using util::SplitString;
+
 static const char* DEFAULT_BENCH_FILTER = ".*";
 static constexpr int64_t DEFAULT_MIN_TIME_MS{10};
 /** Priority level default value, run "all" priority levels */

src/bitcoin-cli.cpp

@@ -42,6 +42,9 @@
 #include <event2/keyvalq_struct.h>
 #include <support/events.h>
 
+using util::Join;
+using util::ToString;
+
 // The server returns time values from a mockable system clock, but it is not
 // trivial to get the mocked time from the server, nor is it needed for now, so
 // just use a plain system_clock.

src/bitcoin-tx.cpp

@@ -32,6 +32,11 @@
 #include <functional>
 #include <memory>
 
+using util::SplitString;
+using util::ToString;
+using util::TrimString;
+using util::TrimStringView;
+
 static bool fCreateBlank;
 static std::map<std::string,UniValue> registers;
 static const int CONTINUE_EXECUTION=-1;

src/bitcoin-wallet.cpp

@@ -24,6 +24,8 @@
 #include <string>
 #include <tuple>
 
+using util::Join;
+
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
 
 static void SetupWalletToolArgs(ArgsManager& argsman)

src/blockfilter.cpp

@@ -16,6 +16,8 @@
 #include <util/golombrice.h>
 #include <util/string.h>
 
+using util::Join;
+
 static const std::map<BlockFilterType, std::string> g_filter_types = {
     {BlockFilterType::BASIC, "basic"},
 };

src/chainparams.cpp

@@ -21,6 +21,8 @@
 #include <stdexcept>
 #include <vector>
 
+using util::SplitString;
+
 void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& options)
 {
     if (args.IsArgSet("-signetseednode")) {

src/clientversion.cpp

@@ -13,6 +13,8 @@
 #include <string>
 #include <vector>
 
+using util::Join;
+
 /**
  * Name of client reported in the 'version' message. Report the same name
  * for both bitcoind and bitcoin-qt, to make it harder for attackers to

src/common/config.cpp

@@ -27,6 +27,9 @@
 #include <utility>
 #include <vector>
 
+using util::TrimString;
+using util::TrimStringView;
+
 static bool GetConfigOptions(std::istream& stream, const std::string& filepath, std::string& error, std::vector<std::pair<std::string, std::string>>& options, std::list<SectionInfo>& sections)
 {
     std::string str, prefix;

src/common/messages.cpp

@@ -20,6 +20,7 @@
 #include <vector>
 
 using node::TransactionError;
+using util::Join;
 
 namespace common {
 std::string StringForFeeReason(FeeReason reason)

src/common/system.cpp

@@ -28,6 +28,8 @@
 #include <string>
 #include <thread>
 
+using util::ReplaceAll;
+
 // Application startup time (used for uptime calculation)
 const int64_t nStartupTime = GetTime();
 

src/core_read.cpp

@@ -16,6 +16,8 @@
 #include <algorithm>
 #include <string>
 
+using util::SplitString;
+
 namespace {
 class OpCodeParser
 {

src/httprpc.cpp

@@ -23,6 +23,9 @@
 #include <string>
 #include <vector>
 
+using util::SplitString;
+using util::TrimStringView;
+
 /** WWW-Authenticate to present with 401 Unauthorized response */
 static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
 

src/i2p.cpp

@@ -26,6 +26,8 @@
 #include <stdexcept>
 #include <string>
 
+using util::Split;
+
 namespace i2p {
 
 /**

src/init.cpp

@@ -137,6 +137,9 @@ using node::NodeContext;
 using node::ShouldPersistMempool;
 using node::ImportBlocks;
 using node::VerifyLoadedChainstate;
+using util::Join;
+using util::ReplaceAll;
+using util::ToString;
 
 static constexpr bool DEFAULT_PROXYRANDOMIZE{true};
 static constexpr bool DEFAULT_REST_ENABLE{false};

src/init/common.cpp

@@ -20,6 +20,8 @@
 #include <string>
 #include <vector>
 
+using util::SplitString;
+
 namespace init {
 void AddLoggingArgs(ArgsManager& argsman)
 {

src/logging.cpp

@@ -13,6 +13,10 @@
 #include <map>
 #include <optional>
 
+using util::Join;
+using util::RemovePrefix;
+using util::ToString;
+
 const char * const DEFAULT_DEBUGLOGFILE = "debug.log";
 constexpr auto MAX_USER_SETABLE_SEVERITY_LEVEL{BCLog::Level::Info};
 

src/logging.h

@@ -189,7 +189,7 @@ namespace BCLog {
         /** Returns a string with the log categories in alphabetical order. */
         std::string LogCategoriesString() const
         {
-            return Join(LogCategoriesList(), ", ", [&](const LogCategory& i) { return i.category; });
+            return util::Join(LogCategoriesList(), ", ", [&](const LogCategory& i) { return i.category; });
         };
 
         //! Returns a string with all user-selectable log levels.

src/netaddress.cpp

@@ -20,6 +20,9 @@
 #include <iterator>
 #include <tuple>
 
+using util::ContainsNoNUL;
+using util::HasPrefix;
+
 CNetAddr::BIP155Network CNetAddr::GetBIP155Network() const
 {
     switch (m_net) {

src/netaddress.h

@@ -448,16 +448,16 @@ class CNetAddr
             // Recognize NET_INTERNAL embedded in IPv6, such addresses are not
             // gossiped but could be coming from addrman, when unserializing from
             // disk.
-            if (HasPrefix(m_addr, INTERNAL_IN_IPV6_PREFIX)) {
+            if (util::HasPrefix(m_addr, INTERNAL_IN_IPV6_PREFIX)) {
                 m_net = NET_INTERNAL;
                 memmove(m_addr.data(), m_addr.data() + INTERNAL_IN_IPV6_PREFIX.size(),
                         ADDR_INTERNAL_SIZE);
                 m_addr.resize(ADDR_INTERNAL_SIZE);
                 return;
             }
 
-            if (!HasPrefix(m_addr, IPV4_IN_IPV6_PREFIX) &&
-                !HasPrefix(m_addr, TORV2_IN_IPV6_PREFIX)) {
+            if (!util::HasPrefix(m_addr, IPV4_IN_IPV6_PREFIX) &&
+                !util::HasPrefix(m_addr, TORV2_IN_IPV6_PREFIX)) {
                 return;
             }
 

src/netbase.cpp

@@ -27,6 +27,8 @@
 #include <sys/un.h>
 #endif
 
+using util::ContainsNoNUL;
+
 // Settings
 static GlobalMutex g_proxyinfo_mutex;
 static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex);

src/node/interface_ui.cpp

@@ -10,6 +10,8 @@
 #include <boost/signals2/optional_last_value.hpp>
 #include <boost/signals2/signal.hpp>
 
+using util::MakeUnorderedList;
+
 CClientUIInterface uiInterface;
 
 struct UISignals {

src/node/interfaces.cpp

@@ -71,6 +71,7 @@ using interfaces::Handler;
 using interfaces::MakeSignalHandler;
 using interfaces::Node;
 using interfaces::WalletLoader;
+using util::Join;
 
 namespace node {
 // All members of the classes in this namespace are intentionally public, as the

src/node/kernel_notifications.cpp

@@ -24,6 +24,8 @@
 #include <string>
 #include <thread>
 
+using util::ReplaceAll;
+
 static void AlertNotify(const std::string& strMessage)
 {
     uiInterface.NotifyAlertChanged();

src/qt/bitcoin.cpp

@@ -85,6 +85,8 @@ Q_DECLARE_METATYPE(uint256)
 Q_DECLARE_METATYPE(wallet::AddressPurpose)
 #endif // ENABLE_WALLET
 
+using util::MakeUnorderedList;
+
 static void RegisterMetaTypes()
 {
     // Register meta types used for QMetaObject::invokeMethod and Qt::QueuedConnection

src/qt/recentrequeststablemodel.cpp

@@ -20,6 +20,8 @@
 #include <QLatin1Char>
 #include <QLatin1String>
 
+using util::ToString;
+
 RecentRequestsTableModel::RecentRequestsTableModel(WalletModel *parent) :
     QAbstractTableModel(parent), walletModel(parent)
 {

src/qt/rpcconsole.cpp

@@ -48,6 +48,8 @@
 
 #include <chrono>
 
+using util::Join;
+
 const int CONSOLE_HISTORY = 50;
 const int INITIAL_TRAFFIC_GRAPH_MINS = 30;
 const QSize FONT_RANGE(4, 40);

src/qt/walletcontroller.cpp

@@ -30,6 +30,7 @@
 #include <QTimer>
 #include <QWindow>
 
+using util::Join;
 using wallet::WALLET_FLAG_BLANK_WALLET;
 using wallet::WALLET_FLAG_DESCRIPTORS;
 using wallet::WALLET_FLAG_DISABLE_PRIVATE_KEYS;

src/rest.cpp

@@ -39,6 +39,7 @@
 
 using node::GetTransaction;
 using node::NodeContext;
+using util::SplitString;
 
 static const size_t MAX_GETUTXOS_OUTPOINTS = 15; //allow a max of 15 outpoints to be queried at once
 static constexpr unsigned int MAX_REST_HEADERS_RESULTS = 2000;

src/rpc/blockchain.cpp

@@ -60,6 +60,9 @@ using kernel::CoinStatsHashType;
 using node::BlockManager;
 using node::NodeContext;
 using node::SnapshotMetadata;
+using util::Join;
+using util::MakeUnorderedList;
+using util::ToString;
 
 struct CUpdatedBlock
 {

src/rpc/mempool.cpp

@@ -34,6 +34,7 @@ using node::DEFAULT_MAX_RAW_TX_FEE_RATE;
 using node::MempoolPath;
 using node::NodeContext;
 using node::TransactionError;
+using util::ToString;
 
 static RPCHelpMan sendrawtransaction()
 {

src/rpc/mining.cpp

@@ -47,6 +47,7 @@ using node::CBlockTemplate;
 using node::NodeContext;
 using node::RegenerateCommitments;
 using node::UpdateTime;
+using util::ToString;
 
 /**
  * Return average network hashes per second based on the last 'lookup' blocks,

src/rpc/net.cpp

@@ -35,6 +35,8 @@
 #include <univalue.h>
 
 using node::NodeContext;
+using util::Join;
+using util::TrimString;
 
 const std::vector<std::string> CONNECTION_TYPE_DOC{
         "outbound-full-relay (default automatic connections)",

src/rpc/server.cpp

@@ -27,6 +27,8 @@
 #include <mutex>
 #include <unordered_map>
 
+using util::SplitString;
+
 static GlobalMutex g_rpc_warmup_mutex;
 static std::atomic<bool> g_rpc_running{false};
 static bool fRPCInWarmup GUARDED_BY(g_rpc_warmup_mutex) = true;

src/rpc/util.cpp

@@ -37,6 +37,9 @@ using common::PSBTError;
 using common::PSBTErrorString;
 using common::TransactionErrorString;
 using node::TransactionError;
+using util::Join;
+using util::SplitString;
+using util::TrimString;
 
 const std::string UNIX_EPOCH_TIME = "UNIX epoch time";
 const std::string EXAMPLE_ADDRESS[2] = {"bc1q09vm5lfy0j5reeulh4x5752q25uqqvz34hufdl", "bc1q02ad21edsxd23d32dfgqqsz4vv4nmtfzuklhy3"};
@@ -796,7 +799,7 @@ std::string RPCHelpMan::ToString() const
         if (arg.m_opts.hidden) break; // Any arg that follows is also hidden
 
         // Push named argument name and description
-        sections.m_sections.emplace_back(::ToString(i + 1) + ". " + arg.GetFirstName(), arg.ToDescriptionString(/*is_named_arg=*/true));
+        sections.m_sections.emplace_back(util::ToString(i + 1) + ". " + arg.GetFirstName(), arg.ToDescriptionString(/*is_named_arg=*/true));
         sections.m_max_pad = std::max(sections.m_max_pad, sections.m_sections.back().m_left.size());
 
         // Recursively push nested args

src/script/descriptor.cpp

@@ -27,6 +27,8 @@
 #include <string>
 #include <vector>
 
+using util::Split;
+
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////

src/script/miniscript.h

@@ -863,8 +863,8 @@ struct Node {
                     if (!key_str) return {};
                     return std::move(ret) + "pk_h(" + std::move(*key_str) + ")";
                 }
-                case Fragment::AFTER: return std::move(ret) + "after(" + ::ToString(node.k) + ")";
-                case Fragment::OLDER: return std::move(ret) + "older(" + ::ToString(node.k) + ")";
+                case Fragment::AFTER: return std::move(ret) + "after(" + util::ToString(node.k) + ")";
+                case Fragment::OLDER: return std::move(ret) + "older(" + util::ToString(node.k) + ")";
                 case Fragment::HASH256: return std::move(ret) + "hash256(" + HexStr(node.data) + ")";
                 case Fragment::HASH160: return std::move(ret) + "hash160(" + HexStr(node.data) + ")";
                 case Fragment::SHA256: return std::move(ret) + "sha256(" + HexStr(node.data) + ")";
@@ -883,7 +883,7 @@ struct Node {
                     return std::move(ret) + "andor(" + std::move(subs[0]) + "," + std::move(subs[1]) + "," + std::move(subs[2]) + ")";
                 case Fragment::MULTI: {
                     CHECK_NONFATAL(!is_tapscript);
-                    auto str = std::move(ret) + "multi(" + ::ToString(node.k);
+                    auto str = std::move(ret) + "multi(" + util::ToString(node.k);
                     for (const auto& key : node.keys) {
                         auto key_str = ctx.ToString(key);
                         if (!key_str) return {};
@@ -893,7 +893,7 @@ struct Node {
                 }
                 case Fragment::MULTI_A: {
                     CHECK_NONFATAL(is_tapscript);
-                    auto str = std::move(ret) + "multi_a(" + ::ToString(node.k);
+                    auto str = std::move(ret) + "multi_a(" + util::ToString(node.k);
                     for (const auto& key : node.keys) {
                         auto key_str = ctx.ToString(key);
                         if (!key_str) return {};
@@ -902,7 +902,7 @@ struct Node {
                     return std::move(str) + ")";
                 }
                 case Fragment::THRESH: {
-                    auto str = std::move(ret) + "thresh(" + ::ToString(node.k);
+                    auto str = std::move(ret) + "thresh(" + util::ToString(node.k);
                     for (auto& sub : subs) {
                         str += "," + std::move(sub);
                     }