sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24376: doc: bitcoin-wallet fixes (help output and code comment)

Browse Source 
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
This commit is contained in:
MarcoFalke 2022-02-21 08:14:41 +01:00 committed by Vijay
parent f1c5ab1fcb
commit 21cea475d8
No known key found for this signature in database
GPG Key ID: E38DD2EE8F0967B1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoin-wallet.cpp
View File

@ -56,7 +56,7 @@ static bool WalletAppInit(ArgsManager& args, int argc, char* argv[])
strUsage += "\n" strUsage += "\n"
"dash-wallet is an offline tool for creating and interacting with " PACKAGE_NAME " wallet files.\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" "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" "Usage:\n"
" dash-wallet [options] <command>\n"; " dash-wallet [options] <command>\n";
strUsage += "\n" + args.GetHelpMessage(); strUsage += "\n" + args.GetHelpMessage();

3
src/wallet/wallet.cpp
View File

@ -1019,7 +1019,8 @@ bool CWallet::LoadToWallet(const uint256& hash, const UpdateWalletTxFn& fill_wtx
if (!fill_wtx(wtx, ins.second)) { if (!fill_wtx(wtx, ins.second)) {
return false; 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()) { if (HaveChain()) {
bool active; bool active;
int height; int height;