diff options
| author | fanquake <fanquake@gmail.com> | 2021-08-16 14:10:34 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-08-16 16:04:47 +0800 |
| commit | 14b480240539eee8d296ed1ac6ec674b34635433 (patch) | |
| tree | faa223c330fb38eed789d83514d095ba1480cafa | |
| parent | 3facf0a8ae99a03f5e2fb709b8d86c47328d363c (diff) | |
wallet: use FormatFullVersion instead of CLIENT_BUILD in rpcdump
| -rw-r--r-- | src/clientversion.cpp | 3 | ||||
| -rw-r--r-- | src/clientversion.h | 1 | ||||
| -rw-r--r-- | src/wallet/rpcdump.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/clientversion.cpp b/src/clientversion.cpp index 195f58b3f3..f97e4097e8 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -42,8 +42,6 @@ const std::string CLIENT_NAME("Satoshi"); #endif #endif -const std::string CLIENT_BUILD(BUILD_DESC BUILD_SUFFIX); - static std::string FormatVersion(int nVersion) { return strprintf("%d.%d.%d", nVersion / 10000, (nVersion / 100) % 100, nVersion % 100); @@ -51,6 +49,7 @@ static std::string FormatVersion(int nVersion) std::string FormatFullVersion() { + static const std::string CLIENT_BUILD(BUILD_DESC BUILD_SUFFIX); return CLIENT_BUILD; } diff --git a/src/clientversion.h b/src/clientversion.h index 0ed3f68094..a3e6233437 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -36,7 +36,6 @@ static const int CLIENT_VERSION = + 1 * CLIENT_VERSION_BUILD; extern const std::string CLIENT_NAME; -extern const std::string CLIENT_BUILD; std::string FormatFullVersion(); diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index cccaff9d65..94680c03f9 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -3,6 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <chain.h> +#include <clientversion.h> #include <core_io.h> #include <interfaces/chain.h> #include <key_io.h> @@ -783,7 +784,7 @@ RPCHelpMan dumpwallet() std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD); + file << strprintf("# Wallet dump created by Bitcoin %s\n", FormatFullVersion()); file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime())); file << strprintf("# * Best block at time of backup was %i (%s),\n", wallet.GetLastBlockHeight(), wallet.GetLastBlockHash().ToString()); file << strprintf("# mined on %s\n", FormatISO8601DateTime(block_time)); |