Skip to content

Commit d734d87

Browse files
laanwjlaanwj
committed
Merge pull request #5749
f754707 Fix - bitcoin-qt usage message (Luca Venturini) 1fdb9fa Help messages correctly formatted (79 chars) (Luca Venturini)
2 parents 45b7dc2 + f754707 commit d734d87

File tree

6 files changed

+230
-215
lines changed

6 files changed

+230
-215
lines changed

‎src/bitcoin-cli.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ using namespace json_spirit;
2020
std::string HelpMessageCli()
2121
{
2222
string strUsage;
23-
strUsage += _("Options:") + "\n";
24-
strUsage += " -? " + _("This help message") + "\n";
25-
strUsage += " -conf=<file> " + strprintf(_("Specify configuration file (default: %s)"), "bitcoin.conf") + "\n";
26-
strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n";
27-
strUsage += " -testnet " + _("Use the test network") + "\n";
28-
strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be "
29-
"solved instantly. This is intended for regression testing tools and app development.") + "\n";
30-
strUsage += " -rpcconnect=<ip> " + strprintf(_("Send commands to node running on <ip> (default: %s)"), "127.0.0.1") + "\n";
31-
strUsage += " -rpcport=<port> " + strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), 8332, 18332) + "\n";
32-
strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n";
33-
strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n";
34-
strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n";
35-
36-
strUsage += "\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n";
37-
strUsage += " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n";
23+
strUsage += HelpMessageGroup(_("Options:"));
24+
strUsage += HelpMessageOpt("-?", _("This help message"));
25+
strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "bitcoin.conf"));
26+
strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
27+
strUsage += HelpMessageOpt("-testnet", _("Use the test network"));
28+
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be "
29+
"solved instantly. This is intended for regression testing tools and app development."));
30+
strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), "127.0.0.1"));
31+
strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), 8332, 18332));
32+
strUsage += HelpMessageOpt("-rpcwait", _("Wait for RPC server to start"));
33+
strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections"));
34+
strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections"));
35+
36+
strUsage += HelpMessageGroup(_("SSL options: (see the Bitcoin Wiki for SSL setup instructions)"));
37+
strUsage += HelpMessageOpt("-rpcssl", _("Use OpenSSL (https) for JSON-RPC connections"));
3838

3939
return strUsage;
4040
}

‎src/bitcoin-tx.cpp

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,34 @@ static bool AppInitRawTx(int argc, char* argv[])
5454

5555
fprintf(stdout, "%s", strUsage.c_str());
5656

57-
strUsage = _("Options:") + "\n";
58-
strUsage += " -? " + _("This help message") + "\n";
59-
strUsage += " -create " + _("Create new, empty TX.") + "\n";
60-
strUsage += " -json " + _("Select JSON output") + "\n";
61-
strUsage += " -txid " + _("Output only the hex-encoded transaction id of the resultant transaction.") + "\n";
62-
strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be solved instantly.") + "\n";
63-
strUsage += " -testnet " + _("Use the test network") + "\n";
64-
strUsage += "\n";
57+
strUsage = HelpMessageGroup(_("Options:"));
58+
strUsage += HelpMessageOpt("-?", _("This help message"));
59+
strUsage += HelpMessageOpt("-create", _("Create new, empty TX."));
60+
strUsage += HelpMessageOpt("-json", _("Select JSON output"));
61+
strUsage += HelpMessageOpt("-txid", _("Output only the hex-encoded transaction id of the resultant transaction."));
62+
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be solved instantly."));
63+
strUsage += HelpMessageOpt("-testnet", _("Use the test network"));
6564

6665
fprintf(stdout, "%s", strUsage.c_str());
6766

68-
69-
strUsage = _("Commands:") + "\n";
70-
strUsage += " delin=N " + _("Delete input N from TX") + "\n";
71-
strUsage += " delout=N " + _("Delete output N from TX") + "\n";
72-
strUsage += " in=TXID:VOUT " + _("Add input to TX") + "\n";
73-
strUsage += " locktime=N " + _("Set TX lock time to N") + "\n";
74-
strUsage += " nversion=N " + _("Set TX version to N") + "\n";
75-
strUsage += " outaddr=VALUE:ADDRESS " + _("Add address-based output to TX") + "\n";
76-
strUsage += " outscript=VALUE:SCRIPT " + _("Add raw script output to TX") + "\n";
77-
strUsage += " sign=SIGHASH-FLAGS " + _("Add zero or more signatures to transaction") + "\n";
78-
strUsage += " This command requires JSON registers:\n";
79-
strUsage += " prevtxs=JSON object\n";
80-
strUsage += " privatekeys=JSON object\n";
81-
strUsage += " See signrawtransaction docs for format of sighash flags, JSON objects.\n";
82-
strUsage += "\n";
67+
strUsage = HelpMessageGroup(_("Commands:"));
68+
strUsage += HelpMessageOpt("delin=N", _("Delete input N from TX"));
69+
strUsage += HelpMessageOpt("delout=N", _("Delete output N from TX"));
70+
strUsage += HelpMessageOpt("in=TXID:VOUT", _("Add input to TX"));
71+
strUsage += HelpMessageOpt("locktime=N", _("Set TX lock time to N"));
72+
strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N"));
73+
strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX"));
74+
strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT", _("Add raw script output to TX"));
75+
strUsage += HelpMessageOpt("sign=SIGHASH-FLAGS", _("Add zero or more signatures to transaction") + ". " +
76+
_("This command requires JSON registers:") +
77+
_("prevtxs=JSON object") + ", " +
78+
_("privatekeys=JSON object") + ". " +
79+
_("See signrawtransaction docs for format of sighash flags, JSON objects."));
8380
fprintf(stdout, "%s", strUsage.c_str());
8481

85-
strUsage = _("Register Commands:") + "\n";
86-
strUsage += " load=NAME:FILENAME " + _("Load JSON file FILENAME into register NAME") + "\n";
87-
strUsage += " set=NAME:JSON-STRING " + _("Set register NAME to given JSON-STRING") + "\n";
88-
strUsage += "\n";
82+
strUsage = HelpMessageGroup(_("Register Commands:"));
83+
strUsage += HelpMessageOpt("load=NAME:FILENAME", _("Load JSON file FILENAME into register NAME"));
84+
strUsage += HelpMessageOpt("set=NAME:JSON-STRING", _("Set register NAME to given JSON-STRING"));
8985
fprintf(stdout, "%s", strUsage.c_str());
9086

9187
return false;

0 commit comments

Comments
 (0)