diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-02-21 08:14:41 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-02-21 08:14:44 +0100 |
| commit | 4acf2332d49dd9ef3fcde2480e2342134b53d688 (patch) | |
| tree | 3a1c9d2bd08558dafea0d4af977c66a28f5274b2 | |
| parent | abaf943477ada2c78ed99b5208287d9959a43769 (diff) | |
| parent | 62cc138ecb9cc7afcbe6fdb42b060a8f149826de (diff) | |
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
| -rw-r--r-- | src/bitcoin-wallet.cpp | 2 | ||||
| -rw-r--r-- | 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 65c37f182f..ff5485e2da 100644 --- a/src/bitcoin-wallet.cpp +++ b/src/bitcoin-wallet.cpp @@ -63,7 +63,7 @@ static bool WalletAppInit(ArgsManager& args, int argc, char* argv[]) strUsage += "\n" "bitcoin-wallet is an offline tool for creating and interacting with " PACKAGE_NAME " wallet files.\n" "By default bitcoin-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/-signet/-testnet arguments.\n\n" "Usage:\n" " bitcoin-wallet [options] <command>\n"; strUsage += "\n" + args.GetHelpMessage(); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 7e694d1987..6549a2146b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1027,7 +1027,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 wallet-tool), don't bother to update txn. + // If wallet doesn't have a chain (e.g when using bitcoin-wallet tool), + // don't bother to update txn. if (HaveChain()) { bool active; auto lookup_block = [&](const uint256& hash, int& height, TxState& state) { |