From fa1d5acb8d8e1842797604fbd1e7c69f6acdb6c7 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Wed, 15 Jan 2025 12:15:40 +0100
Subject: [PATCH] refactor: Use TranslateFn type consistently
The type was introduced in the previous commit.
---
src/bitcoin-cli.cpp | 2 +-
src/bitcoin-tx.cpp | 2 +-
src/bitcoin-util.cpp | 2 +-
src/bitcoin-wallet.cpp | 2 +-
src/bitcoind.cpp | 2 +-
src/kernel/bitcoinkernel.cpp | 3 ++-
src/qt/main.cpp | 2 +-
src/test/util/setup_common.cpp | 2 +-
8 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 5c5965245bc..1b2d97faff5 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -50,7 +50,7 @@ using util::ToString;
// just use a plain system_clock.
using CliClock = std::chrono::system_clock;
-const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+const TranslateFn G_TRANSLATION_FUN{nullptr};
static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index a627c24e868..e2b3a3b5545 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -41,7 +41,7 @@ static bool fCreateBlank;
static std::map<std::string,UniValue> registers;
static const int CONTINUE_EXECUTION=-1;
-const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+const TranslateFn G_TRANSLATION_FUN{nullptr};
static void SetupBitcoinTxArgs(ArgsManager &argsman)
{
diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index ff2e4fb8005..10967bd573a 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -26,7 +26,7 @@
static const int CONTINUE_EXECUTION=-1;
-const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+const TranslateFn G_TRANSLATION_FUN{nullptr};
static void SetupBitcoinUtilArgs(ArgsManager &argsman)
{
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
index 033cf7a0f39..c37f9d29958 100644
--- a/src/bitcoin-wallet.cpp
+++ b/src/bitcoin-wallet.cpp
@@ -26,7 +26,7 @@
using util::Join;
-const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+const TranslateFn G_TRANSLATION_FUN{nullptr};
static void SetupWalletToolArgs(ArgsManager& argsman)
{
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 5d5f06127d2..d210e2c8ba1 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -34,7 +34,7 @@
using node::NodeContext;
-const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+const TranslateFn G_TRANSLATION_FUN{nullptr};
#if HAVE_DECL_FORK
diff --git a/src/kernel/bitcoinkernel.cpp b/src/kernel/bitcoinkernel.cpp
index bb101ba186a..9096b6f71de 100644
--- a/src/kernel/bitcoinkernel.cpp
+++ b/src/kernel/bitcoinkernel.cpp
@@ -1,10 +1,11 @@
// Copyright (c) 2022 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#include <util/translation.h>
#include <functional>
#include <string>
// Define G_TRANSLATION_FUN symbol in libbitcoinkernel library so users of the
// library aren't required to export this symbol
-extern const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+extern const TranslateFn G_TRANSLATION_FUN{nullptr};
diff --git a/src/qt/main.cpp b/src/qt/main.cpp
index 16befd99e89..649fead901d 100644
--- a/src/qt/main.cpp
+++ b/src/qt/main.cpp
@@ -13,7 +13,7 @@
#include <string>
/** Translate string to current locale using Qt. */
-extern const std::function<std::string(const char*)> G_TRANSLATION_FUN = [](const char* psz) {
+extern const TranslateFn G_TRANSLATION_FUN = [](const char* psz) {
return QCoreApplication::translate("bitcoin-core", psz).toStdString();
};
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 1ebc3464d84..c66e000306e 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -72,7 +72,7 @@ using node::LoadChainstate;
using node::RegenerateCommitments;
using node::VerifyLoadedChainstate;
-const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
+const TranslateFn G_TRANSLATION_FUN{nullptr};
constexpr inline auto TEST_DIR_PATH_ELEMENT{"test_common bitcoin"}; // Includes a space to catch possible path escape issues.
/** Random context to get unique temp data dirs. Separate from m_rng, which can be seeded from a const env var */