Skip to content

Commit dcbe024

Browse files
committed
Merge #17648: doc: rename wallet-tool references to bitcoin-wallet
e7ad4a2 doc: rename wallet-tool references to bitcoin-wallet (Wilson Ccasihue S) Pull request description: Fix. text reference to executable bitcoin-wallet instead of wallet-tool, there is not a wallet-tool at bin/ folder. ACKs for top commit: fanquake: ACK e7ad4a2 - thanks for following up. Tree-SHA512: aed41b08947728a4ff3a97a62858ee7c86e2e5d57dcbbd0aab492dae3d8a548bb60541924e68cf3a0aa3d53d7db0012b489462b466919cd83f05b2aa88b7fff7
2 parents bce4408 + e7ad4a2 commit dcbe024

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/bitcoin-wallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ static bool WalletAppInit(int argc, char* argv[])
4141
}
4242
if (argc < 2 || HelpRequested(gArgs)) {
4343
std::string usage = strprintf("%s bitcoin-wallet version", PACKAGE_NAME) + " " + FormatFullVersion() + "\n\n" +
44-
"wallet-tool is an offline tool for creating and interacting with Bitcoin Core wallet files.\n" +
45-
"By default wallet-tool will act on wallets in the default mainnet wallet directory in the datadir.\n" +
44+
"bitcoin-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.\n" +
45+
"By default bitcoin-wallet will act on wallets in the default mainnet wallet directory in the datadir.\n" +
4646
"To change the target wallet, use the -datadir, -wallet and -testnet/-regtest arguments.\n\n" +
4747
"Usage:\n" +
4848
" bitcoin-wallet [options] <command>\n\n" +

src/wallet/wallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose)
822822

823823
void CWallet::LoadToWallet(CWalletTx& wtxIn)
824824
{
825-
// If wallet doesn't have a chain (e.g wallet-tool), lock can't be taken.
825+
// If wallet doesn't have a chain (e.g bitcoin-wallet), lock can't be taken.
826826
auto locked_chain = LockChain();
827827
if (locked_chain) {
828828
Optional<int> block_height = locked_chain->getBlockHeight(wtxIn.m_confirm.hashBlock);
@@ -2944,7 +2944,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
29442944
{
29452945
// Even if we don't use this lock in this function, we want to preserve
29462946
// lock order in LoadToWallet if query of chain state is needed to know
2947-
// tx status. If lock can't be taken (e.g wallet-tool), tx confirmation
2947+
// tx status. If lock can't be taken (e.g bitcoin-wallet), tx confirmation
29482948
// status may be not reliable.
29492949
auto locked_chain = LockChain();
29502950
LOCK(cs_wallet);

0 commit comments

Comments
 (0)