Skip to content

Commit 90f0951

Browse files
authored
Merge pull request #4251 from ProvableHQ/update_max_warnings
Update max warnings
2 parents aed09f4 + b3e2b9b commit 90f0951

5 files changed

Lines changed: 11 additions & 5 deletions

File tree

.ci/test_db_backup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ checkpoint_height=3
1616
rollback_height=10
1717
num_checkpoints=0
1818
remaining_checkpoints=2
19-
max_warnings=20
19+
max_warnings=40
2020

2121
# Create log directory
2222
init_log_dir

.ci/test_devnet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ NODE_VERBOSITY=3
2424
: "${total_clients:=4}" # need at least 4 clients, so each validator has at least one client connected to it.
2525
: "${network_id:=0}"
2626
: "${min_height:=60}" # To likely go past the 100 round garbage collection limit.
27-
: "${max_warnings:=10}"
27+
: "${max_warnings:=40}"
2828

2929
# shellcheck source=SCRIPTDIR/utils.sh
3030
. ./.ci/utils.sh

.ci/test_full_upgrade.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ set -eo pipefail # error on any command failure
1818
total_validators=$1
1919
total_clients=$2
2020
network_id=$3
21+
max_warnings=$4
2122

2223
# Default values if not provided
2324
: "${total_validators:=4}"
2425
: "${total_clients:=2}"
2526
: "${network_id:=0}"
27+
: "${max_warnings:=40}"
2628

2729
# Node verbosity
2830
NODE_VERBOSITY=1
@@ -379,7 +381,7 @@ done
379381

380382
log "Upgrade test passed: network reached highest consensus version with release, all nodes upgraded to PR snarkos, and consensus version remained correct."
381383

382-
if check_logs "$log_dir" "$total_validators" "$total_clients" 20; then
384+
if check_logs "$log_dir" "$total_validators" "$total_clients" "$max_warnings"; then
383385
exit 0
384386
else
385387
exit 1

.ci/test_partial_upgrade.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ set -eo pipefail # error on any command failure
2222
# --- Parameters from CLI ---
2323
total_validators=$1
2424
network_id=$2
25+
max_warnings=$3
2526

2627
# Default values if not provided
2728
: "${total_validators:=4}"
2829
: "${network_id:=0}"
30+
: "${max_warnings:=40}"
2931

3032
# Node verbosity
3133
NODE_VERBOSITY=1
@@ -292,7 +294,7 @@ fi
292294

293295
log "🎉 Test passed! Node synced to new consensus height ($new_consensus_height) after another node was upgraded."
294296

295-
if check_logs "$log_dir" "$total_validators" 0 20; then
297+
if check_logs "$log_dir" "$total_validators" 0 "$max_warnings"; then
296298
exit 0
297299
else
298300
exit 1

.ci/test_restart_majority.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ network_id=$2
2020
reset_interval=$3
2121
final_height=$4
2222
num_resets=$5
23+
max_warnings=$6
2324

2425
# Default values if not provided
2526
: "${total_validators:=7}"
2627
: "${network_id:=0}"
2728
: "${reset_interval:=10}"
2829
: "${final_height:=20}"
2930
: "${num_resets:=3}"
31+
: "${max_warnings:=40}"
3032

3133
max_faulty=$(( (total_validators - 1) / 3 ))
3234
# AleoBFT needs at least N-f for a quorum, not 2*f+1.
@@ -102,7 +104,7 @@ fi
102104

103105
log "SUCCESS! Network took $(elapsed_since "$start") seconds to reach final height of $final_height after $num_resets resets."
104106

105-
if check_logs "$log_dir" "$total_validators" 0 40; then
107+
if check_logs "$log_dir" "$total_validators" 0 "$max_warnings"; then
106108
exit 0
107109
else
108110
exit 1

0 commit comments

Comments
 (0)