Skip to content

Commit 2965cd6

Browse files
authored
Merge pull request #4039 from ProvableHQ/fix/sync-race-conditions
[Fix] Pause BFT block advancement during sync
2 parents 4bc6cdf + e808114 commit 2965cd6

File tree

37 files changed

+2437
-1509
lines changed

37 files changed

+2437
-1509
lines changed

.ci/test_restart_majority.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ start=$(now)
5656

5757
# Start all validator nodes in the background
5858
for validator_index in $(seq 0 $((total_validators-1))); do
59-
snarkos clean "--dev=$validator_index" "--network=$network_id" --keep-node-data
60-
6159
run_with_prefix "validator-$validator_index" snarkos start "${common_flags[@]}" "--dev=$validator_index" --validator --logfile="$log_dir/validator-$validator_index.log"
6260
PIDS[validator_index]=$!
6361
log "Started validator $validator_index with PID ${PIDS[$validator_index]}"

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ workflows:
788788
filters:
789789
branches:
790790
only:
791-
- prevent_block_response_race_disconnect
791+
- fix/sync-race-conditions
792792
- canary
793793
- testnet
794794
- mainnet
@@ -798,7 +798,7 @@ workflows:
798798
filters:
799799
branches:
800800
only:
801-
- prevent_block_response_race_disconnect
801+
- fix/sync-race-conditions
802802
- canary
803803
- testnet
804804
- mainnet

0 commit comments

Comments
 (0)