From 184fa2a6a01f4fb3cc575441505fce54c0f5682c Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 12 Feb 2019 11:09:57 -0500 Subject: [PATCH] Merge #14543: [QA] minor p2p_sendheaders fix of height in coinbase 1cdb9bb51f minor p2p_sendheaders fix of height in coinbase (Gregory Sanders) Pull request description: > \# Now announce a header that forks the last two blocks Doesn't effect any behavior since BIP34 isn't active in regtest for many blocks. Tree-SHA512: 3f214b956a94250bb640f63b6ff707930e1d4cb8df1bbf0fef4012d89a94bafbde0d7b42bbe7113ec33810169281c22c6e389445921d99decb74aa56e87a0f27 --- test/functional/p2p_sendheaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/p2p_sendheaders.py b/test/functional/p2p_sendheaders.py index 6860cac538..41158de1e9 100755 --- a/test/functional/p2p_sendheaders.py +++ b/test/functional/p2p_sendheaders.py @@ -494,7 +494,7 @@ class SendHeadersTest(BitcoinTestFramework): # Now announce a header that forks the last two blocks tip = blocks[0].sha256 - height -= 1 + height -= 2 blocks = [] # Create extra blocks for later