gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add timeout for local cluster partition tests (bp #16123) (#16136)

Browse Source 
* Add timeout for local cluster partition tests (#16123)

* Add timeout for local cluster partition tests

* fix optimistic conf test logs

* Bump instruction count assertions

(cherry picked from commit e817a6db00)

# Conflicts:
#	local-cluster/Cargo.toml
#	local-cluster/tests/local_cluster.rs
#	programs/bpf/tests/programs.rs

* Fix conflicts

* Revert instruction count assertion changes

Co-authored-by: Justin Starry <justin@solana.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-03-26 00:15:08 +00:00
committed by GitHub
parent 0bb95b470f
commit 579575fe84
5 changed files with 81 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/optimistic_confirmation_verifier.rs
View File

@@ -76,7 +76,7 @@ impl OptimisticConfirmationVerifier {
self.last_optimistic_slot_ts = Instant::now();
}
pub fn format_optimistic_confirmd_slot_violation_log(slot: Slot) -> String {
pub fn format_optimistic_confirmed_slot_violation_log(slot: Slot) -> String {
format!("Optimistically confirmed slot {} was not rooted", slot)
}
@@ -109,7 +109,7 @@ impl OptimisticConfirmationVerifier {
voted stake: {},
total epoch stake: {},
pct: {}",
Self::format_optimistic_confirmd_slot_violation_log(*optimistic_slot),
Self::format_optimistic_confirmed_slot_violation_log(*optimistic_slot),
hash,
epoch,
r_slot_tracker