Skip to content

Commit

Permalink
Use human-friendly time formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
teor2345 committed Jul 20, 2022
1 parent b43528a commit 727cef4
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion zebra-chain/src/fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use proptest::prelude::*;
use proptest_derive::Arbitrary;

pub mod time;
pub use time::humantime_seconds;
pub use time::{humantime_milliseconds, humantime_seconds};

/// Wrapper to override `Debug`, redirecting it to only output the type's name.
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
Expand Down
15 changes: 14 additions & 1 deletion zebra-chain/src/fmt/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use std::time::Duration;

/// Returns a human-friendly formatted string for `duration.as_secs()`.
/// Returns a human-friendly formatted string for the whole number of seconds in `duration`.
pub fn humantime_seconds(duration: impl Into<Duration>) -> String {
let duration = duration.into();

Expand All @@ -13,3 +13,16 @@ pub fn humantime_seconds(duration: impl Into<Duration>) -> String {

format!("{}", duration)
}

/// Returns a human-friendly formatted string for the whole number of milliseconds in `duration`.
pub fn humantime_milliseconds(duration: impl Into<Duration>) -> String {
let duration = duration.into();

// Truncate fractional seconds.
let duration_secs = Duration::from_secs(duration.as_secs());
let duration_millis = Duration::from_millis(duration.subsec_millis().into());

let duration = humantime::format_duration(duration_secs + duration_millis);

format!("{}", duration)
}
5 changes: 3 additions & 2 deletions zebra-state/src/service/non_finalized_state/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use tracing::instrument;
use zebra_chain::{
amount::{Amount, NegativeAllowed, NonNegative},
block::{self, Height},
fmt::humantime_milliseconds,
history_tree::HistoryTree,
orchard,
parameters::Network,
Expand Down Expand Up @@ -361,8 +362,8 @@ impl Chain {
let rebuild_time_per_block =
rebuild_time / rebuilt_block_count.try_into().expect("fits in u32");
info!(
?rebuild_time,
?rebuild_time_per_block,
rebuild_time = ?humantime_milliseconds(rebuild_time),
rebuild_time_per_block = ?humantime_milliseconds(rebuild_time_per_block),
?rebuilt_block_count,
?fork_height,
?fork_tip,
Expand Down

0 comments on commit 727cef4

Please sign in to comment.