netinfo: clarify client and server versions in header #22894

pull jonatack wants to merge 1 commits into bitcoin:master from jonatack:netinfo-clarify-client-and-server-versions changing 1 files +1 −1

jonatack commented at 10:51 AM on September 5, 2021: contributor
Clarify in -netinfo output that both the client and the server versions are provided.

before
```
Bitcoin Core v22.0.0rc3 - 70016/Satoshi:22.99.0/
```
after
```
Bitcoin Core client v22.0.0rc3 - server 70016/Satoshi:22.99.0/
```
Closes #22873.
netinfo: clarify client and server versions in header e952d7557e
jonatack cross-referenced this on Sep 5, 2021 from issue bitcoin-cli -netinfo displays verison number of bitcoin-cli, not the running bitcoind by benthecarman
DrahtBot added the label Utils/log/libs on Sep 5, 2021
practicalswift commented at 11:44 AM on September 5, 2021: contributor

Concept ACK
benthecarman approved
benthecarman commented at 6:01 PM on September 5, 2021: contributor

utACK e952d7557eaf2610e302e9d70381ef057d07f6bf
unknown approved

unknown commented at 6:46 PM on September 5, 2021: none

ACK https://github.com/bitcoin/bitcoin/pull/22894/commits/e952d7557eaf2610e302e9d70381ef057d07f6bf

nit:

-std::string result{strprintf("%s client %s%s - server %i%s\n\n", PACKAGE_NAME, FormatFullVersion(), ChainToString(), networkinfo["protocolversion"].get_int(), networkinfo["subversion"].get_str())};
+std::string result{strprintf("%s %s%s (client) - %i%s (server)\n\n", PACKAGE_NAME, FormatFullVersion(), ChainToString(), networkinfo["protocolversion"].get_int(), networkinfo["subversion"].get_str())};

-Bitcoin Core client v22.0.0rc3 - server 70016/Satoshi:22.99.0/
+Bitcoin Core v22.0.0rc3 (client) - 70016/Satoshi:22.99.0/ (server)

Zero-1729 approved
Zero-1729 commented at 8:11 PM on September 5, 2021: contributor

tACK e952d7557eaf2610e302e9d70381ef057d07f6bf

Subtle but useful change 🍹
jonatack commented at 8:37 PM on September 5, 2021: contributor

Bitcoin Core v22.0.0rc3 (client) - 70016/Satoshi:22.99.0/ (server)

Not bad! though I think they are better as prefixes rather than suffixes and shorter rather than longer, particularly with longer headers. Some of the versions can be quite long.
MarcoFalke merged this on Sep 6, 2021
MarcoFalke closed this on Sep 6, 2021
jonatack deleted the branch on Sep 6, 2021
sidhujag referenced this in commit e2ff796f39 on Sep 7, 2021
bitcoin locked this on Sep 6, 2022

Contributors

Labels

Linked (view graph)

#22873 bitcoin-cli -netinfo displays verison number of bitcoin-cli, not the running bitcoind