Skip to content

Commit fa11fec

Browse files
author
MarcoFalke
committed
doc: Move buried deployment doc to the enum that enumerates them
This is more visible than a comment hidden in an RPC helper function.
1 parent ddc6979 commit fa11fec

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/consensus/params.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111

1212
namespace Consensus {
1313

14-
enum BuriedDeployment : int16_t
15-
{
14+
/**
15+
* A buried deployment is one where the height of the activation has been hardcoded into
16+
* the client implementation long after the consensus change has activated. See BIP 90.
17+
*/
18+
enum BuriedDeployment : int16_t {
1619
// buried deployments get negative values to avoid overlap with DeploymentPos
1720
DEPLOYMENT_HEIGHTINCB = std::numeric_limits<int16_t>::min(),
1821
DEPLOYMENT_CLTV,
@@ -22,8 +25,7 @@ enum BuriedDeployment : int16_t
2225
};
2326
constexpr bool ValidDeployment(BuriedDeployment dep) { return DEPLOYMENT_HEIGHTINCB <= dep && dep <= DEPLOYMENT_SEGWIT; }
2427

25-
enum DeploymentPos : uint16_t
26-
{
28+
enum DeploymentPos : uint16_t {
2729
DEPLOYMENT_TESTDUMMY,
2830
DEPLOYMENT_TAPROOT, // Deployment of Schnorr/Taproot (BIPs 340-342)
2931
// NOTE: Also add new deployments to VersionBitsDeploymentInfo in deploymentinfo.cpp

src/rpc/blockchain.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,8 +1350,6 @@ static RPCHelpMan verifychain()
13501350
static void SoftForkDescPushBack(const CBlockIndex* active_chain_tip, UniValue& softforks, const Consensus::Params& params, Consensus::BuriedDeployment dep)
13511351
{
13521352
// For buried deployments.
1353-
// A buried deployment is one where the height of the activation has been hardcoded into
1354-
// the client implementation long after the consensus change has activated. See BIP 90.
13551353
// Buried deployments with activation height value of
13561354
// std::numeric_limits<int>::max() are disabled and thus hidden.
13571355
if (!DeploymentEnabled(params, dep)) return;

0 commit comments

Comments
 (0)