From aab2df208a78cf85df17d84e718447de2c3f7b8a Mon Sep 17 00:00:00 2001 From: steviez Date: Fri, 27 Aug 2021 00:21:33 -0500 Subject: [PATCH] fixup! Fix fork race condition in optimistic violation tower tests (#19192) (#19459) --- local-cluster/tests/local_cluster.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs index b2c9efd7b3..cba3171165 100644 --- a/local-cluster/tests/local_cluster.rs +++ b/local-cluster/tests/local_cluster.rs @@ -1137,8 +1137,10 @@ fn test_fork_choice_refresh_old_votes() { &lighter_fork_ledger_path, &context.lighter_fork_validator_key, ); - let heaviest_fork_latest_vote = - wait_for_last_vote_in_tower_to_land_in_ledger(&heaviest_ledger_path, &context.heaviest_validator_key); + let heaviest_fork_latest_vote = wait_for_last_vote_in_tower_to_land_in_ledger( + &heaviest_ledger_path, + &context.heaviest_validator_key, + ); // Open ledgers let smallest_blockstore = open_blockstore(&smallest_ledger_path); @@ -2807,7 +2809,8 @@ fn do_test_optimistic_confirmation_violation_with_or_without_tower(with_tower: b info!("Create validator A's ledger"); { // Find latest vote in B, and wait for it to reach blockstore - let b_last_vote = wait_for_last_vote_in_tower_to_land_in_ledger(&val_b_ledger_path, &validator_b_pubkey); + let b_last_vote = + wait_for_last_vote_in_tower_to_land_in_ledger(&val_b_ledger_path, &validator_b_pubkey); // Now we copy these blocks to A let b_blockstore = open_blockstore(&val_b_ledger_path);