Remove more warnings, both deprecations and unused imports (#884)

* fix warnings by switching from deprecated chronos API addTimer(...) to setTimer(...) and removing especially some unnecessary chronicles and extras imports from test suite modules

* update a couple v0.10.1 spec references to v0.11.1
This commit is contained in:
tersec 2020-04-11 17:41:50 +00:00 committed by GitHub
parent 8ebd0e166e
commit d25d674502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 11 deletions

View File

@ -882,14 +882,14 @@ proc handleMissingBlocks(node: BeaconNode) =
# work with while the sync problem is dealt with more systematically
dec left
if left == 0:
addTimer(Moment.now()) do (p: pointer):
discard setTimer(Moment.now()) do (p: pointer):
handleMissingBlocks(node)
proc onSecond(node: BeaconNode, moment: Moment) {.async.} =
node.handleMissingBlocks()
let nextSecond = max(Moment.now(), moment + chronos.seconds(1))
addTimer(nextSecond) do (p: pointer):
discard setTimer(nextSecond) do (p: pointer):
asyncCheck node.onSecond(nextSecond)
# TODO: Should we move these to other modules?
@ -1037,7 +1037,7 @@ proc run*(node: BeaconNode) =
asyncCheck node.onSlotStart(curSlot, nextSlot)
let second = Moment.now() + chronos.seconds(1)
addTimer(second) do (p: pointer):
discard setTimer(second) do (p: pointer):
asyncCheck node.onSecond(second)
runForever()

View File

@ -89,7 +89,7 @@ func getAncestorAt*(blck: BlockRef, slot: Slot): BlockRef =
blck = blck.parent
func get_ancestor*(blck: BlockRef, slot: Slot): BlockRef =
## https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/specs/phase0/fork-choice.md#get_ancestor
## https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/fork-choice.md#get_ancestor
## Return ancestor at slot, or nil if queried block is older
var blck = blck

View File

@ -181,7 +181,7 @@ const
# Phase 1 - Custody game
# ---------------------------------------------------------------
# https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/specs/phase1/custody-game.md#constants
# https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/configs/minimal.yaml#L201
# TODO those are included in minimal.yaml but not mainnet.yaml
# Why?
RANDAO_PENALTY_EPOCHS* = 2

View File

@ -31,7 +31,7 @@
# now.
import
chronicles, options,
chronicles,
./extras, ./ssz, metrics,
./spec/[datatypes, crypto, digest, helpers, validator],
./spec/[state_transition_block, state_transition_epoch],

View File

@ -79,7 +79,7 @@ func saturate*(d: tuple[inFuture: bool, offset: Duration]): Duration =
if d.inFuture: d.offset else: seconds(0)
proc addTimer*(fromNow: Duration, cb: CallbackFunc, udata: pointer = nil) =
addTimer(Moment.now() + fromNow, cb, udata)
discard setTimer(Moment.now() + fromNow, cb, udata)
func shortLog*(d: Duration): string =
let dd = int64(d.milliseconds())

View File

@ -10,8 +10,7 @@
import
times, unittest,
./testutil, ./testblockutil,
../beacon_chain/spec/[beaconstate, datatypes, digest],
../beacon_chain/extras
../beacon_chain/spec/[beaconstate, datatypes, digest]
suiteReport "Beacon state" & preset():
timedTest "Smoke test initialize_beacon_state_from_eth1" & preset():

View File

@ -8,7 +8,7 @@
{.used.}
import
unittest, chronicles,
unittest,
./testutil,
../beacon_chain/spec/datatypes,
../beacon_chain/[beacon_node_types, block_pool, ssz]

View File

@ -11,7 +11,7 @@ import
unittest,
./testutil, ./testblockutil,
../beacon_chain/spec/[beaconstate, datatypes, digest, validator],
../beacon_chain/[extras, state_transition, ssz]
../beacon_chain/[state_transition, ssz]
suiteReport "Block processing" & preset():
## For now just test that we can compile and execute block processing with