Skip to content

Commit

Permalink
Merge bitcoin#24376: doc: bitcoin-wallet fixes (help output and code …
Browse files Browse the repository at this point in the history
…comment)

62cc138 Rename wallet-tool to bitcoin-wallet in code comment (Kristaps Kaupe)
0db3ad3 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 bitcoin#17648 at other places).

ACKs for top commit:
  RandyMcMillan:
    tACK 62cc138

Tree-SHA512: c5df7811b8200f61943908dcf3b2b788fe991bf00bef28f069ab8784924556ffd5d86fc0ba2ad0b3c3f9be2ba73a34bc67059d7c057bba646c1801ffa3cb2070
  • Loading branch information
MarcoFalke authored and vijaydasmp committed Dec 7, 2024
1 parent f1c5ab1 commit 21cea47
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/bitcoin-wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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] <command>\n";
strUsage += "\n" + args.GetHelpMessage();
Expand Down
3 changes: 2 additions & 1 deletion src/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 21cea47

Please sign in to comment.