Punctuation/grammer fixes in rpcwallet.cpp #10789

pull stevendlander wants to merge 1 commits into bitcoin:master from stevendlander:cli-punctuation-standardization changing 1 files +6 −6

stevendlander commented at 2:05 AM on July 11, 2017: contributor

Standardizing punctuation on CLI output and also including a few fixes for grammer. This PR is for text only changes and includes no code edits.
meshcollider commented at 2:35 AM on July 11, 2017: contributor

NACK, disagree with the addition of full stops to every line and most of the changes in capitalization. Only a couple of the changes are valid spelling fixes, prefer if they were isolated from the rest
laanwj added the label Refactoring on Jul 11, 2017
jonasschnelli added the label Docs and Output on Jul 11, 2017
jonasschnelli removed the label Refactoring on Jul 11, 2017
stevendlander commented at 1:54 PM on July 11, 2017: contributor

Isolated spelling fixes and reverted all but one capitalization. Will revert that too if needed, thanks.

in src/wallet/rpcwallet.cpp:722 in 37a8e6f4d2 outdated

 718 | @@ -719,7 +719,7 @@ UniValue getbalance(const JSONRPCRequest& request)
 719 |              "\nExamples:\n"
 720 |              "\nThe total amount in the wallet\n"
 721 |              + HelpExampleCli("getbalance", "") +
 722 | -            "\nThe total amount in the wallet at least 5 blocks confirmed\n"
 723 | +            "\nThe total amount in the wallet at least 6 blocks confirmed\n"

jonasschnelli commented at 1:59 PM on July 11, 2017:

Ideally we include wallet.h's DEFAULT_TX_CONFIRM_TARGET here somehow.

stevendlander commented at 5:02 PM on July 11, 2017:

Should I code up a solution to that in this PR?

morcos commented at 12:29 PM on July 18, 2017:

No. It's a different concept

stevendlander commented at 8:14 PM on July 11, 2017: contributor

I'll tidy up the places where the const char needs to be an unsigned int.
stevendlander commented at 9:07 PM on July 11, 2017: contributor

Open to suggestions on a better approach for string-ifying DEFAULT_TX_CONFIRM_TARGET. I would imagine importing <string> just to do that is not ideal.

in src/wallet/rpcwallet.cpp:591 in 31347fdb94 outdated

 587 | @@ -587,10 +588,10 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
 588 |              + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"") +
 589 |              "\nThe amount including unconfirmed transactions, zero confirmations\n"
 590 |              + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" 0") +
 591 | -            "\nThe amount with at least 6 confirmation, very safe\n"
 592 | -            + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" 6") +
 593 | +            "\nThe amount with at least " + std::to_string(DEFAULT_TX_CONFIRM_TARGET) + " confirmation, very safe\n"

TheBlueMatt commented at 8:11 PM on July 14, 2017:

lol, lets remove the "very safe" doge-speak...

morcos commented at 2:22 PM on July 15, 2017: member

NACK.

I don't like tying the DEFAULT_TX_CONFIRM_TARGET to the concept of how many confirmations we might want to wait before considering a transaction to have low chance of being re-orged out. These are unrelated concepts that just both happen to use the number 6 right now.
jtimon commented at 6:03 AM on July 17, 2017: contributor

What about adding a different constant? Needs rebase.
stevendlander commented at 2:24 AM on July 19, 2017: contributor

Updated to address @morcos feedback.
FilmCoder commented at 6:59 PM on July 19, 2017: none

Very grammar, much pull request, merge now wow.
jtimon commented at 8:07 PM on July 19, 2017: contributor

utACK e439bebdc03ea42bb76c4fce9edbaf0470ddd3d9 Please squash into one commit.
Fix misspellings and remove safety verbiage a5ecaf1490
TheBlueMatt commented at 3:24 PM on July 24, 2017: member

utACK a5ecaf1490be8d01ac6806785157230d30f77061, we should take this for 15.
laanwj merged this on Jul 25, 2017
laanwj closed this on Jul 25, 2017
laanwj referenced this in commit 1124328ad1 on Jul 25, 2017
PastaPastaPasta referenced this in commit 9a946f50e6 on Sep 16, 2019
PastaPastaPasta referenced this in commit 0631cd95da on Sep 18, 2019
barrystyle referenced this in commit 605b30a127 on Jan 22, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Labels