From bbed824a64f0a5335442261b3abd63db22453cd6 Mon Sep 17 00:00:00 2001 From: jeanpablo Date: Sun, 30 Aug 2026 15:39:01 +0100 Subject: [PATCH] wallet: remove unused warnings parameter from CreateFromDump `CreateFromDump` never writes to the vector, so the loop that prints it in wallet-tool cannot produce output. `tool_wallet.py` already asserts empty output for `createfromdump`. The only `warnings.push_back()` was removed in 7a41c939f0 ("wallet: Remove -format and bdb from wallet tool's createfromdump"). --- src/wallet/dump.cpp | 2 +- src/wallet/dump.h | 3 +-- src/wallet/wallettool.cpp | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/wallet/dump.cpp b/src/wallet/dump.cpp index 3083bc05d2a..ec576cc90c0 100644 --- a/src/wallet/dump.cpp +++ b/src/wallet/dump.cpp @@ -119,7 +119,7 @@ static void WalletToolReleaseWallet(CWallet* wallet) delete wallet; } -bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::path& wallet_path, bilingual_str& error, std::vector& warnings) +bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::path& wallet_path, bilingual_str& error) { if (name.empty()) { tfm::format(std::cerr, "Wallet name cannot be empty\n"); diff --git a/src/wallet/dump.h b/src/wallet/dump.h index 5dfed35f9c7..f4093e303b4 100644 --- a/src/wallet/dump.h +++ b/src/wallet/dump.h @@ -8,7 +8,6 @@ #include #include -#include struct bilingual_str; class ArgsManager; @@ -17,7 +16,7 @@ namespace wallet { class WalletDatabase; bool DumpWallet(const ArgsManager& args, WalletDatabase& db, bilingual_str& error); -bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::path& wallet_path, bilingual_str& error, std::vector& warnings); +bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::path& wallet_path, bilingual_str& error); } // namespace wallet #endif // BITCOIN_WALLET_DUMP_H diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp index 336bc45cacf..e6d34d6879c 100644 --- a/src/wallet/wallettool.cpp +++ b/src/wallet/wallettool.cpp @@ -162,11 +162,7 @@ bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command) return ret; } else if (command == "createfromdump") { bilingual_str error; - std::vector warnings; - bool ret = CreateFromDump(args, name, path, error, warnings); - for (const auto& warning : warnings) { - tfm::format(std::cout, "%s\n", warning.original); - } + bool ret = CreateFromDump(args, name, path, error); if (!ret && !error.empty()) { tfm::format(std::cerr, "%s\n", error.original); }