diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-19 14:42:33 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-19 14:50:31 +0100 |
| commit | 3b59fa2ce8aa193a3b2168435a3277f00c90ee72 (patch) | |
| tree | cc9d702fdde0d6d73eedd388c49a9d8311ed5975 | |
| parent | f55808ad6939607c6efb79e9b3604140498c6042 (diff) | |
| parent | 979bc0c206c581c59460ed167bdc293b2a834cb5 (diff) | |
Merge #15178: qt: Improve "help-console" message
979bc0c206c581c59460ed167bdc293b2a834cb5 Improve "help-console" message (Hennadii Stepanov)
Pull request description:
Added a note that results can be queried in the parenthesized syntax as it does not work in the standard syntax.
Deprecated (since #8704) boolean `verbose` replaced with numerical `verbosity` in `getblock` examples.
Current master (acec9e45c6fb6d5e72908c1a87b2b14f1ca5e3a0):
Master + this PR:
Tree-SHA512: 663e359ed117306f789fdefcae298194fdd6f5477c87912740e1683323974a333dcca13f17bb2c0aa66639ab7658bd53e535ae8fe671ea5fc557a3db4b192908
| -rw-r--r-- | src/qt/rpcconsole.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 351da6976a..96de18b2bf 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -396,13 +396,12 @@ void RPCExecutor::request(const QString &command, const WalletModel* wallet_mode std::string executableCommand = command.toStdString() + "\n"; // Catch the console-only-help command before RPC call is executed and reply with help text as-if a RPC reply. - if(executableCommand == "help-console\n") - { + if(executableCommand == "help-console\n") { Q_EMIT reply(RPCConsole::CMD_REPLY, QString(("\n" "This console accepts RPC commands using the standard syntax.\n" " example: getblockhash 0\n\n" - "This console can also accept RPC commands using parenthesized syntax.\n" + "This console can also accept RPC commands using the parenthesized syntax.\n" " example: getblockhash(0)\n\n" "Commands may be nested when specified with the parenthesized syntax.\n" @@ -412,11 +411,11 @@ void RPCExecutor::request(const QString &command, const WalletModel* wallet_mode " example: getblockhash 0\n" " getblockhash,0\n\n" - "Named results can be queried with a non-quoted key string in brackets.\n" - " example: getblock(getblockhash(0) true)[tx]\n\n" + "Named results can be queried with a non-quoted key string in brackets using the parenthesized syntax.\n" + " example: getblock(getblockhash(0) 1)[tx]\n\n" - "Results without keys can be queried using an integer in brackets.\n" - " example: getblock(getblockhash(0),true)[tx][0]\n\n"))); + "Results without keys can be queried with an integer in brackets using the parenthesized syntax.\n" + " example: getblock(getblockhash(0),1)[tx][0]\n\n"))); return; } if (!RPCConsole::RPCExecuteCommandLine(m_node, result, executableCommand, nullptr, wallet_model)) { |