update getnetworkinfo help with subversion #4982

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:networkinfo changing 1 files +24 −18

Diapolo commented at 9:59 AM on September 25, 2014: none
- add missing subversion field to getnetworkinfo help
- fix style and format errors in help string
- remove unneeded int cast
in src/rpcnet.cpp:None in b12117359f outdated
```
 398 | @@ -393,15 +399,15 @@ Value getnetworkinfo(const Array& params, bool fHelp)
 399 |          );
 400 |  
 401 |      Object obj;
 402 | -    obj.push_back(Pair("version",       (int)CLIENT_VERSION));
```
laanwj commented at 10:01 AM on September 25, 2014:

No whitespace changes please..

Diapolo commented at 11:21 AM on September 25, 2014:

Then please let's fix our sources once via clang-format. Anyway... I've reverted them.

laanwj commented at 11:24 AM on September 25, 2014:

That will happen at some point. It just gets a bit annoying to have to remind you of this with every commit. Diffs are much easier to review if you only change the lines that actually sensibly change (as you did now, thanks).

Diapolo commented at 11:26 AM on September 25, 2014:

It's a brain fuckup on my side, sorry! I still hope we get to a state where clang-format is applied :).
Diapolo commented at 1:43 PM on September 28, 2014: none

@laanwj Can you verify this is correct now?

in src/rpcnet.cpp:None in 675ebe4665 outdated

 378 | -            "      \"limited\": xxx,         (boolean) is the network limited using -onlynet?\n"
 379 | -            "      \"reachable\": xxx,       (boolean) is the network reachable?\n"
 380 | -            "      \"proxy\": \"host:port\"  (string) the proxy that is used for this network, or empty if none\n"
 381 | -            "    },\n"
 382 | +            "  \"version\": xxxxx,                      (numeric) the server version\n"
 383 | +            "  \"subversion\": \"/Satoshi:0.9.3/\",     (string) the server subversion string\n"

laanwj commented at 7:31 AM on October 1, 2014:

May be better to use /Satoshi:x.x.x/ here, to avoid people updating this every version

sipa commented at 8:11 AM on October 1, 2014:

Or just insert the actual version :)

Diapolo commented at 8:21 AM on October 1, 2014:

I guess I'll stick with @laanwj's suggestion, as that better matches current format of the help message.

laanwj commented at 8:28 AM on October 1, 2014:

Haha :) Yes, it'd need some more contorted syntax to get a dynamic string in here.

update getnetworkinfo help with subversion

- add missing subversion field to getnetworkinfo help
- fix style and format errors in help string
- remove unneeded int casts

b5ec5fe0cb

Diapolo commented at 8:23 AM on October 1, 2014: none

@laanwj Updated!
BitcoinPullTester commented at 8:40 AM on October 1, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4982_b5ec5fe0cb0a85cb626167b66fdda3bed8c5ba19/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
TheBlueMatt commented at 5:35 PM on October 1, 2014: member

utACK
jgarzik commented at 5:37 PM on October 1, 2014: contributor

ut ACK
Diapolo commented at 12:12 PM on October 3, 2014: none

Can we have this merged then?
laanwj merged this on Oct 3, 2014
laanwj closed this on Oct 3, 2014
laanwj referenced this in commit cd91ed4f5f on Oct 3, 2014
Diapolo deleted the branch on Oct 3, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors