This simplifies the code and solves intermittent timeouts caused by commit 0d39b5848a7a341cd2b958336861cdd4098e2616.
E.g. https://cirrus-ci.com/task/5196092369272832?command=ci#L3126
0 test 2021-02-08T12:27:56.275000Z TestFramework (ERROR): Assertion failed
1 Traceback (most recent call last):
2 File "/tmp/cirrus-ci-build/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/test_framework/test_framework.py", line 127, in main
3 self.run_test()
4 File "/tmp/cirrus-ci-build/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/feature_assumevalid.py", line 180, in run_test
5 self.assert_blockchain_height(self.nodes[0], 101)
6 File "/tmp/cirrus-ci-build/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/feature_assumevalid.py", line 92, in assert_blockchain_height
7 assert False, "blockchain too short after timeout: %d" % current_height
8 AssertionError: blockchain too short after timeout: 101