From 21cea475d8e3ef05261624eb79cffa7a8e72d5a1 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 21 Feb 2022 08:14:41 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#24376: doc: bitcoin-wallet fixes (help output and code comment) 62cc138ecb9cc7afcbe6fdb42b060a8f149826de Rename wallet-tool to bitcoin-wallet in code comment (Kristaps Kaupe) 0db3ad3ba41a76dff80bcb5f292e587da400ebf1 Mention -signet in bitcoin-wallet help output (Kristaps Kaupe) Pull request description: * Mention `-signet` in sentence where there is already `-testnet/-signet` in help output. * Rename `wallet-tool` to `bitcoin-wallet` in single remaining place in code comments (was already done in #17648 at other places). ACKs for top commit: RandyMcMillan: tACK 62cc138ecb Tree-SHA512: c5df7811b8200f61943908dcf3b2b788fe991bf00bef28f069ab8784924556ffd5d86fc0ba2ad0b3c3f9be2ba73a34bc67059d7c057bba646c1801ffa3cb2070 --- src/bitcoin-wallet.cpp | 2 +- src/wallet/wallet.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp index 176b455ce9..8e7c1490fd 100644 --- a/src/bitcoin-wallet.cpp +++ b/src/bitcoin-wallet.cpp @@ -56,7 +56,7 @@ static bool WalletAppInit(ArgsManager& args, int argc, char* argv[]) strUsage += "\n" "dash-wallet is an offline tool for creating and interacting with " PACKAGE_NAME " wallet files.\n" "By default dash-wallet will act on wallets in the default mainnet wallet directory in the datadir.\n" - "To change the target wallet, use the -datadir, -wallet and -testnet/-regtest arguments.\n\n" + "To change the target wallet, use the -datadir, -wallet and -regtest/-testnet arguments.\n\n" "Usage:\n" " dash-wallet [options] \n"; strUsage += "\n" + args.GetHelpMessage(); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 346a2ec199..874b000c86 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1019,7 +1019,8 @@ bool CWallet::LoadToWallet(const uint256& hash, const UpdateWalletTxFn& fill_wtx if (!fill_wtx(wtx, ins.second)) { return false; } - // If wallet doesn't have a chain (e.g dash-wallet), don't bother to update txn. + // If wallet doesn't have a chain (e.g when using dash-wallet tool), + // don't bother to update txn. if (HaveChain()) { bool active; int height;