Skip to content

Commit

Permalink
Merge bitcoin#22894: netinfo: clarify client and server versions in h…
Browse files Browse the repository at this point in the history
…eader

e952d75 netinfo: clarify client and server versions in header (Jon Atack)

Pull request description:

  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 bitcoin#22873.

ACKs for top commit:
  benthecarman:
    utACK e952d75
  prayank23:
    ACK bitcoin@e952d75
  Zero-1729:
    tACK e952d75

Tree-SHA512: 3e817892d398aabacb1401fd5b1816c4d4f563b4f8cf1096bdb8b53f7c4ef82d4caee09f5c7724f1fe292f837434a332acefba735152ed24a238bb6f006df909
  • Loading branch information
MarcoFalke authored and UdjinM6 committed Apr 18, 2023
1 parent 58df43c commit 683c9a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bitcoin-cli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ class NetinfoRequestHandler : public BaseRequestHandler
}

// Generate report header.
std::string result{strprintf("%s %s%s - %i%s\n\n", PACKAGE_NAME, FormatFullVersion(), ChainToString(), networkinfo["protocolversion"].get_int(), networkinfo["subversion"].get_str())};
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())};

// Report detailed peer connections list sorted by direction and minimum ping time.
if (DetailsRequested() && !m_peers.empty()) {
Expand Down

0 comments on commit 683c9a4

Please sign in to comment.