Change Details

Apply the following patch on master: ``` diff --git a/test/functional/abc_p2p_avalanche_voting.py b/test/functional/abc_p2p_avalanche_voting.py index 633d17f13b..293f0da27a 100755 --- a/test/functional/abc_p2p_avalanche_voting.py +++ b/test/functional/abc_p2p_avalanche_voting.py @@ -235,11 +235,6 @@ class AvalancheTest(BitcoinTestFramework): with node.assert_debug_log([f"Avalanche accepted block {tip_to_park}"]): self.wait_until(lambda: has_accepted_tip(tip_to_park)) - # Answer no again and switch back to rejecting the block. - with node.assert_debug_log([f"Avalanche rejected block {tip_to_park}"]): - self.wait_until(lambda: has_parked_tip(tip_to_park)) - assert_equal(node.getbestblockhash(), fork_tip) - # Vote a few more times until the block gets invalidated hash_tip_park = int(tip_to_park, 16) node.wait_for_debug_log( @@ -247,6 +242,7 @@ class AvalancheTest(BitcoinTestFramework): chatty_callable=lambda: can_find_block_in_poll( hash_tip_park, AvalancheVoteError.PARKED) ) + assert has_parked_tip(tip_to_park) # Mine on the current chaintip to trigger polling and so we don't reorg old_fork_tip = fork_tip ``` This fails! ninja && ./test/functional/test_runner.py abc_p2p_avalanche_voting Apply this patch and see that it now succeeds as expected.

Wrap the `"Avalanche invalidated block {tip_to_park}"` check with: ``` with node.assert_debug_log([f"Avalanche invalidated block {tip_to_park}"]): ``` This fails! ninja && ./test/functional/test_runner.py abc_p2p_avalanche_voting Apply this patch and see that it now succeeds as expected.

ApplyWrap the following patch on master:`"Avalanche invalidated block {tip_to_park}"` check with: ``` diff --git a/test/functional/abc_p2p_avalanche_voting.py b/test/functional/abc_p2p_avalanche_voting.py index 633d17f13b..293f0da27a 100755 --- a/test/functional/abc_p2p_avalanche_voting.py +++ b/test/functional/abc_p2p_avalanche_voting.py @@ -235,11 +235,6 @@ class AvalancheTest(BitcoinTestFramework): with node.assert_debug_log([f"Avalanche accepted block {tip_to_park}"]): self.wait_until(lambda: has_accepted_tip(tip_to_park)) - # Answer no again and switch back to rejecting the block. - with node.assert_debug_log([f"Avalanche rejected block {tip_to_park}"]): - self.wait_until(lambda: has_parked_tip(tip_to_park)) - assert_equal(node.getbestblockhash(), fork_tip) - # Vote a few more times until the block gets invalidated hash_tip_park = int(tip_to_park, 16) node.wait_for_debug_log( @@ -247,6 +242,7 @@ class AvalancheTest(BitcoinTestFramework): chatty_callable=lambda: can_find_block_in_poll( hash_tip_park, AvalancheVoteError.PARKED) ) + assert has_parked_tip(tip_to_park) # Mine on the current chaintip to trigger polling and so we don't reorg old_fork_tip = fork_tipinvalidated block {tip_to_park}"]): ``` This fails! ninja && ./test/functional/test_runner.py abc_p2p_avalanche_voting Apply this patch and see that it now succeeds as expected.