status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix time formatting and pre-genesis ops

This commit is contained in:
Jacek Sieka 2020-11-25 00:39:52 +01:00 committed by zah
parent 151d116f02
commit e1e4871287
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
beacon_chain/time.nim
View File

@ -52,10 +52,10 @@ template `+`*(t: BeaconTime, offset: Duration): BeaconTime =
BeaconTime(Duration(t) + offset) BeaconTime(Duration(t) + offset)
template `-`*(t: BeaconTime, offset: Duration): BeaconTime = template `-`*(t: BeaconTime, offset: Duration): BeaconTime =
BeaconTime(Duration(t) - offset) BeaconTime(nanoseconds(nanoseconds(Duration(t)) - nanoseconds(offset)))
template `-`*(a, b: BeaconTime): Duration = template `-`*(a, b: BeaconTime): Duration =
Duration(a) - Duration(b) nanoseconds(nanoseconds(Duration(a)) - nanoseconds(Duration(b)))
func toSlot*(t: BeaconTime): tuple[afterGenesis: bool, slot: Slot] = func toSlot*(t: BeaconTime): tuple[afterGenesis: bool, slot: Slot] =
let ti = seconds(Duration(t)) let ti = seconds(Duration(t))
@ -84,7 +84,6 @@ proc now*(c: BeaconClock): BeaconTime =
proc fromNow*(c: BeaconClock, t: BeaconTime): tuple[inFuture: bool, offset: Duration] = proc fromNow*(c: BeaconClock, t: BeaconTime): tuple[inFuture: bool, offset: Duration] =
let now = c.now() let now = c.now()
if t > now: if t > now:
(true, t - now) (true, t - now)
else: else:
@ -106,23 +105,7 @@ proc addTimer*(fromNow: Duration, cb: CallbackFunc, udata: pointer = nil) =
raiseAssert e.msg raiseAssert e.msg
func shortLog*(d: Duration): string = func shortLog*(d: Duration): string =
let dd = int64(d.milliseconds()) $d
if dd < 1000:
$dd & "ms"
elif dd < 60 * 1000:
$(dd div 1000) & "s"
elif dd < 60 * 60 * 1000:
let secs = dd div 1000
var tmp = $(secs div 60) & "m"
if (let frac = secs mod 60; frac > 0):
tmp &= $frac & "s"
tmp
else:
let mins = dd div 60 * 1000
var tmp = $(mins div 60) & "h"
if (let frac = mins mod 60; frac > 0):
tmp &= $frac & "m"
tmp
func toFloatSeconds*(d: Duration): float = func toFloatSeconds*(d: Duration): float =
float(milliseconds(d)) / 1000.0 float(milliseconds(d)) / 1000.0