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

Avoid panic caused by converting non-positive / non-normal floating points values to duration (#9867) (#9872)

Browse Source 
(cherry picked from commit 3aedb81d48)

Co-authored-by: Kristofer Peterson <svenski123@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2020-05-04 14:27:40 -07:00
committed by GitHub
parent 000b763e95
commit 909316bd53
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/src/cluster_query.rs
View File

@ -486,14 +486,13 @@ pub fn process_catchup(
let slot_distance = rpc_slot as i64 - node_slot as i64; let slot_distance = rpc_slot as i64 - node_slot as i64;
let slots_per_second = let slots_per_second =
(previous_slot_distance - slot_distance) as f64 / f64::from(sleep_interval); (previous_slot_distance - slot_distance) as f64 / f64::from(sleep_interval);
let time_remaining = if slots_per_second <= 0.0 { let time_remaining = (slot_distance as f64 / slots_per_second).round();
let time_remaining = if !time_remaining.is_normal() || time_remaining <= 0.0 {
"".to_string() "".to_string()
} else { } else {
format!( format!(
". Time remaining: {}", ". Time remaining: {}",
humantime::format_duration(Duration::from_secs_f64( humantime::format_duration(Duration::from_secs_f64(time_remaining))
(slot_distance as f64 / slots_per_second).round()
))
) )
}; };