Skip to content

Commit 8c5533c

Browse files
committed
rpc: remove deprecated "softforks" field from getblockchaininfo
1 parent 225e5b5 commit 8c5533c

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

src/rpc/blockchain.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,16 +1150,9 @@ static void SoftForkDescPushBack(const CBlockIndex* blockindex, UniValue& softfo
11501150
softforks.pushKV(DeploymentName(id), rv);
11511151
}
11521152

1153-
namespace {
1154-
/* TODO: when -deprecatedrpc=softforks is removed, drop these */
1155-
UniValue DeploymentInfo(const CBlockIndex* tip, const ChainstateManager& chainman);
1156-
extern const std::vector<RPCResult> RPCHelpForDeployment;
1157-
}
1158-
11591153
// used by rest.cpp:rest_chaininfo, so cannot be static
11601154
RPCHelpMan getblockchaininfo()
11611155
{
1162-
/* TODO: from v24, remove -deprecatedrpc=softforks */
11631156
return RPCHelpMan{"getblockchaininfo",
11641157
"Returns an object containing various state info regarding blockchain processing.\n",
11651158
{},
@@ -1181,12 +1174,6 @@ RPCHelpMan getblockchaininfo()
11811174
{RPCResult::Type::NUM, "pruneheight", /*optional=*/true, "lowest-height complete block stored (only present if pruning is enabled)"},
11821175
{RPCResult::Type::BOOL, "automatic_pruning", /*optional=*/true, "whether automatic pruning is enabled (only present if pruning is enabled)"},
11831176
{RPCResult::Type::NUM, "prune_target_size", /*optional=*/true, "the target size used by pruning (only present if automatic pruning is enabled)"},
1184-
{RPCResult::Type::OBJ_DYN, "softforks", /*optional=*/true, "(DEPRECATED, returned only if config option -deprecatedrpc=softforks is passed) status of softforks",
1185-
{
1186-
{RPCResult::Type::OBJ, "xxxx", "name of the softfork",
1187-
RPCHelpForDeployment
1188-
},
1189-
}},
11901177
{RPCResult::Type::STR, "warnings", "any network and blockchain warnings"},
11911178
}},
11921179
RPCExamples{
@@ -1226,10 +1213,6 @@ RPCHelpMan getblockchaininfo()
12261213
}
12271214
}
12281215

1229-
if (IsDeprecatedRPCEnabled("softforks")) {
1230-
obj.pushKV("softforks", DeploymentInfo(&tip, chainman));
1231-
}
1232-
12331216
obj.pushKV("warnings", GetWarnings(false).original);
12341217
return obj;
12351218
},

0 commit comments

Comments
 (0)