diff options
| author | Anthony Towns <aj@erisian.com.au> | 2021-08-01 18:36:43 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2021-08-02 23:48:32 +1000 |
| commit | 059171009b0138555f311cedc2553015ff618323 (patch) | |
| tree | 4e40cd538f4d0feeac76f639cd85f9f833340bae /src/consensus | |
| parent | 6499928bfb19674f98724b4aa5238d874e6738e4 (diff) | |
| download | bitcoin-059171009b0138555f311cedc2553015ff618323.tar.xz | |
consensus/params: simplify ValidDeployment check to avoid gcc warning
Diffstat (limited to 'src/consensus')
| -rw-r--r-- | src/consensus/params.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h index 9205cfee87..77bf7fd0d8 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -23,7 +23,7 @@ enum BuriedDeployment : int16_t { DEPLOYMENT_CSV, DEPLOYMENT_SEGWIT, }; -constexpr bool ValidDeployment(BuriedDeployment dep) { return DEPLOYMENT_HEIGHTINCB <= dep && dep <= DEPLOYMENT_SEGWIT; } +constexpr bool ValidDeployment(BuriedDeployment dep) { return dep <= DEPLOYMENT_SEGWIT; } enum DeploymentPos : uint16_t { DEPLOYMENT_TESTDUMMY, @@ -31,7 +31,7 @@ enum DeploymentPos : uint16_t { // NOTE: Also add new deployments to VersionBitsDeploymentInfo in deploymentinfo.cpp MAX_VERSION_BITS_DEPLOYMENTS }; -constexpr bool ValidDeployment(DeploymentPos dep) { return DEPLOYMENT_TESTDUMMY <= dep && dep <= DEPLOYMENT_TAPROOT; } +constexpr bool ValidDeployment(DeploymentPos dep) { return dep < MAX_VERSION_BITS_DEPLOYMENTS; } /** * Struct for each individual consensus rule change using BIP9. |