Skip to content

Commit 1a41e63

Browse files
committed
Merge bitcoin/bitcoin#30642: doc: add missing "testnet4" network string in RPC/init help texts
7015300 doc: add missing "testnet4" network string in RPC/init help texts (Sebastian Falbesoner) Pull request description: The following bitcoind parameters / RPC calls still missed the "testnet4" network string: - `-chain=` parameter - `getblockchaininfo` RPC, `"chain"` result - `getmininginfo` RPC, `"chain"` result The occurences were found via `$ git grep \".*main.*test.*\"`. ACKs for top commit: maflcko: review ACK 7015300 glozow: ACK 7015300 tdb3: ACK 7015300 BrandonOdiwuor: ACK 7015300 danielabrozzoni: ACK 7015300 Tree-SHA512: 99bf5c2b4cf28651feaff2fc7d4669961012dfa8379d8522251540ae1b8fc77d1761b75395903b527580530f42a3c1fd2dd2d8dba4ffbc9b6e55cb357c3a271b
2 parents 7583eac + 7015300 commit 1a41e63

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/chainparamsbase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
void SetupChainParamsBaseOptions(ArgsManager& argsman)
1515
{
16-
argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: main). Allowed values: main, test, signet, regtest", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
16+
argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: main). Allowed values: main, test, testnet4, signet, regtest", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
1717
argsman.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
1818
"This is intended for regression testing tools and app development. Equivalent to -chain=regtest.", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
1919
argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (segwit, bip34, dersig, cltv, csv). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);

src/rpc/blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ RPCHelpMan getblockchaininfo()
12731273
RPCResult{
12741274
RPCResult::Type::OBJ, "", "",
12751275
{
1276-
{RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"},
1276+
{RPCResult::Type::STR, "chain", "current network name (main, test, testnet4, signet, regtest)"},
12771277
{RPCResult::Type::NUM, "blocks", "the height of the most-work fully-validated chain. The genesis block has height 0"},
12781278
{RPCResult::Type::NUM, "headers", "the current number of headers we have validated"},
12791279
{RPCResult::Type::STR, "bestblockhash", "the hash of the currently best block"},

src/rpc/mining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ static RPCHelpMan getmininginfo()
422422
{RPCResult::Type::NUM, "difficulty", "The current difficulty"},
423423
{RPCResult::Type::NUM, "networkhashps", "The network hashes per second"},
424424
{RPCResult::Type::NUM, "pooledtx", "The size of the mempool"},
425-
{RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"},
425+
{RPCResult::Type::STR, "chain", "current network name (main, test, testnet4, signet, regtest)"},
426426
(IsDeprecatedRPCEnabled("warnings") ?
427427
RPCResult{RPCResult::Type::STR, "warnings", "any network and blockchain warnings (DEPRECATED)"} :
428428
RPCResult{RPCResult::Type::ARR, "warnings", "any network and blockchain warnings (run with `-deprecatedrpc=warnings` to return the latest warning as a single string)",

0 commit comments

Comments
 (0)