diff options
| author | Anthony Towns <aj@erisian.com.au> | 2017-10-17 18:47:57 +1000 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-11-06 19:09:05 -0800 |
| commit | 526023aa7a99955dffcd406224963e6c193c1ddf (patch) | |
| tree | e0c7c12f8f527197b960dd86b2cee08f2d1b3f2c /src/chainparams.cpp | |
| parent | 6157e8ce3937af3f46d3e7dd922d19d6dc272145 (diff) | |
| download | bitcoin-526023aa7a99955dffcd406224963e6c193c1ddf.tar.xz | |
Improve handling of BIP9Deployment limits
Small tweaks by Pieter Wuille.
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index afdac16da4..9aa100f49f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -283,13 +283,13 @@ public: consensus.nMinerConfirmationWindow = 144; // Faster than normal for regtest (144 instead of 2016) consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28; consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 999999999999ULL; + consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL; + consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 999999999999ULL; + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00"); |