Page MenuHomePhabricator
Files F13711161

D7734.id24195.diff
No OneTemporary
Actions

D7734.id24195.diff
View Options

diff --git a/doc/release-notes.md b/doc/release-notes.md
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -5,3 +5,8 @@
<https://download.bitcoinabc.org/0.22.4/>
This release includes the following features and fixes:
+
+Miscellaneous CLI Changes
+-------------------------
+- The `testnet` field in `bitcoin-cli -getinfo` has been renamed to `chain` and
+ now returns the current network name as defined in BIP70 (main, test, regtest).
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -332,10 +332,8 @@
batch[ID_NETWORKINFO]["result"]["networks"][0]["proxy"]);
result.pushKV("difficulty",
batch[ID_BLOCKCHAININFO]["result"]["difficulty"]);
- result.pushKV(
- "testnet",
- UniValue(batch[ID_BLOCKCHAININFO]["result"]["chain"].get_str() ==
- "test"));
+ result.pushKV("chain",
+ UniValue(batch[ID_BLOCKCHAININFO]["result"]["chain"]));
if (!batch[ID_WALLETINFO].isNull()) {
result.pushKV("walletversion",
batch[ID_WALLETINFO]["result"]["walletversion"]);
diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py
--- a/test/functional/interface_bitcoin_cli.py
+++ b/test/functional/interface_bitcoin_cli.py
@@ -87,8 +87,7 @@
assert_equal(cli_get_info['proxy'],
network_info['networks'][0]['proxy'])
assert_equal(cli_get_info['difficulty'], blockchain_info['difficulty'])
- assert_equal(cli_get_info['testnet'],
- blockchain_info['chain'] == "test")
+ assert_equal(cli_get_info['chain'], blockchain_info['chain'])
if self.is_wallet_compiled():
assert_equal(cli_get_info['balance'], wallet_info['balance'])
assert_equal(cli_get_info['keypoololdest'],

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 10:37 (5 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573306
Default Alt Text
D7734.id24195.diff (1 KB)

Event Timeline