test: Set regtest.BIP65Height = 111 to speed up tests #21862

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2105-testFasterBip65 changing 6 files +11 −11

MarcoFalke commented at 7:22 AM on May 5, 2021: member

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.
fanquake added the label Tests on May 5, 2021
MarcoFalke force-pushed on May 5, 2021
MarcoFalke marked this as a draft on May 5, 2021
practicalswift commented at 9:53 AM on May 5, 2021: contributor

Concept ACK
DrahtBot commented at 3:36 PM on May 5, 2021: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #22788 (scripted-diff: Use generate* from TestFramework by MarcoFalke)
- #22567 (test: Implicitly sync after generate* to preempt races and intermittent test failures by MarcoFalke)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
theStack commented at 8:52 PM on May 9, 2021: member

Concept ACK
MarcoFalke force-pushed on Aug 5, 2021
MarcoFalke force-pushed on Aug 17, 2021
MarcoFalke force-pushed on Aug 17, 2021
MarcoFalke renamed this:
~~test: Set regtest.BIP65Height = 112 to speed up tests~~
test: Set regtest.BIP65Height = 111 to speed up tests
on Aug 17, 2021
Zero-1729 commented at 1:24 PM on August 17, 2021: contributor

Concept ACK
MarcoFalke marked this as ready for review on Aug 23, 2021
MarcoFalke force-pushed on Aug 23, 2021
MarcoFalke commented at 11:02 AM on August 23, 2021: member

Rebased and ready for review
theStack approved
theStack commented at 12:16 PM on August 23, 2021: member

Tested ACK faa5228f7427ed467bb0a6806fc891d61f23c76b 🚀

Good to see that the burden of generating large numbers of blocks is more and more relieved. This enables nice speed-ups for the affected tests (>3x for feature_cltv.py, 2x for rpc_signrawtransaction.py on my machine).
Zero-1729 approved
Zero-1729 commented at 1:33 PM on August 23, 2021: contributor

tACK faa5228 🧪

Tested on macOS v11.5.2

Clean changes, affected tests aren't broken. More importantly, saw the following times on master and this patch respectively:

Master

File User System

test/functional/feature_cltv.py 1.35s 0.36s

test/functional/rpc_blockchain.py 1.00s 0.31s

test/functional/rpc_signrawtransaction.py 3.44s 0.68s

After Patch

File User System

test/functional/feature_cltv.py 0.33s 0.11s

test/functional/rpc_blockchain.py 1.00s 0.31s

test/functional/rpc_signrawtransaction.py 1.52s 0.41s
DrahtBot added the label Needs rebase on Aug 24, 2021
Set regtest.BIP65Height = 111 to speed up tests faf7e485e9
MarcoFalke force-pushed on Aug 26, 2021
MarcoFalke commented at 9:08 AM on August 26, 2021: member

Rebased (trivial)
DrahtBot removed the label Needs rebase on Aug 26, 2021
theStack approved
theStack commented at 6:17 PM on August 26, 2021: member

re-ACK faf7e485e901d6c72db5d969b526fa148060a003 📍

Checked via git range-diff faa5228f...faf7e485 that changes since my last ACK are only rebase-related.
Zero-1729 approved
Zero-1729 commented at 7:04 PM on August 26, 2021: contributor

re-ACK faf7e485e901d6c72db5d969b526fa148060a003 🧋

LGTM, clean rebase since last review 🧼
kristapsk approved
kristapsk commented at 8:53 PM on August 26, 2021: contributor

ACK faf7e485e901d6c72db5d969b526fa148060a003
fanquake merged this on Aug 26, 2021
fanquake closed this on Aug 26, 2021
MarcoFalke deleted the branch on Aug 27, 2021
sidhujag referenced this in commit 42c98c4502 on Aug 28, 2021
DrahtBot locked this on Aug 27, 2022