Skip to content

Commit 4acf233

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24376: doc: bitcoin-wallet fixes (help output and code 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 #17648 at other places). ACKs for top commit: RandyMcMillan: tACK 62cc138 Tree-SHA512: c5df7811b8200f61943908dcf3b2b788fe991bf00bef28f069ab8784924556ffd5d86fc0ba2ad0b3c3f9be2ba73a34bc67059d7c057bba646c1801ffa3cb2070
2 parents abaf943 + 62cc138 commit 4acf233

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/bitcoin-wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static bool WalletAppInit(ArgsManager& args, int argc, char* argv[])
6363
strUsage += "\n"
6464
"bitcoin-wallet is an offline tool for creating and interacting with " PACKAGE_NAME " wallet files.\n"
6565
"By default bitcoin-wallet will act on wallets in the default mainnet wallet directory in the datadir.\n"
66-
"To change the target wallet, use the -datadir, -wallet and -testnet/-regtest arguments.\n\n"
66+
"To change the target wallet, use the -datadir, -wallet and -regtest/-signet/-testnet arguments.\n\n"
6767
"Usage:\n"
6868
" bitcoin-wallet [options] <command>\n";
6969
strUsage += "\n" + args.GetHelpMessage();

src/wallet/wallet.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,8 @@ bool CWallet::LoadToWallet(const uint256& hash, const UpdateWalletTxFn& fill_wtx
10271027
if (!fill_wtx(wtx, ins.second)) {
10281028
return false;
10291029
}
1030-
// If wallet doesn't have a chain (e.g wallet-tool), don't bother to update txn.
1030+
// If wallet doesn't have a chain (e.g when using bitcoin-wallet tool),
1031+
// don't bother to update txn.
10311032
if (HaveChain()) {
10321033
bool active;
10331034
auto lookup_block = [&](const uint256& hash, int& height, TxState& state) {

0 commit comments

Comments
 (0)