diff options
| author | fanquake <fanquake@gmail.com> | 2021-08-27 07:35:02 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-08-27 07:53:25 +0800 |
| commit | adccbb380b2ee8abbc2f337cd69b4f13cd763602 (patch) | |
| tree | fae9680944e0e40f817c03fec280b838d4c3c785 /src | |
| parent | b8d45a3c2015568ecc699736bd750f36321d948f (diff) | |
| parent | faf7e485e901d6c72db5d969b526fa148060a003 (diff) | |
Merge bitcoin/bitcoin#21862: test: Set regtest.BIP65Height = 111 to speed up tests
faf7e485e901d6c72db5d969b526fa148060a003 Set regtest.BIP65Height = 111 to speed up tests (MarcoFalke)
Pull request description:
No need to waste time by forcing creation of more than 1000 blocks to get the benefits of being able to test BIP 65. Also, reducing the height makes it more likely that (third-party) tests are conforming to BIP 65, which is enforced on mainnet for all new blocks.
ACKs for top commit:
theStack:
re-ACK faf7e485e901d6c72db5d969b526fa148060a003 📍
Zero-1729:
re-ACK faf7e485e901d6c72db5d969b526fa148060a003
kristapsk:
ACK faf7e485e901d6c72db5d969b526fa148060a003
Tree-SHA512: 79a8263e7233838666b9b636b496a8b9eb12398c779f9434677e1d62816732c0a7c7b3e73965be1fb0038d35e05e5a90e665bd74e9610104127dfc4ea38169bf
Diffstat (limited to 'src')
| -rw-r--r-- | src/chainparams.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c3bbb147be..4cc37560a3 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -392,7 +392,7 @@ public: consensus.BIP16Exception = uint256(); consensus.BIP34Height = 2; // BIP34 activated on regtest (Block at height 1 not enforced for testing purposes) consensus.BIP34Hash = uint256(); - consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in functional tests) + consensus.BIP65Height = 111; // BIP65 activated on regtest (Block at height 110 and earlier not enforced for testing purposes) consensus.BIP66Height = 102; // BIP66 activated on regtest (Block at height 101 and earlier not enforced for testing purposes) consensus.CSVHeight = 432; // CSV activated on regtest (Used in rpc activation tests) consensus.SegwitHeight = 0; // SEGWIT is always activated on regtest unless overridden |