synchronize test summaries with make test (and do a few small cleanups) (#1415)

This commit is contained in:
tersec 2020-08-03 12:07:25 +00:00 committed by GitHub
parent 1c6936a35c
commit 5b13d8f3fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions

View File

@ -90,8 +90,10 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
+ Pbkdf2 decryption OK
+ Pbkdf2 encryption OK
+ Pbkdf2 errors OK
+ Scrypt decryption OK
+ Scrypt encryption OK
```
OK: 3/3 Fail: 0/3 Skip: 0/3
OK: 5/5 Fail: 0/5 Skip: 0/5
## Mocking utilities
```diff
+ merkle_minimal OK
@ -245,4 +247,4 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
OK: 1/1 Fail: 0/1 Skip: 0/1
---TOTAL---
OK: 134/139 Fail: 0/139 Skip: 5/139
OK: 136/141 Fail: 0/141 Skip: 5/141

View File

@ -38,7 +38,6 @@ const
type
RpcServer* = RpcHttpServer
KeyPair = eth2_network.KeyPair
# "state" is already taken by BeaconState
BeaconNodeStatus* = enum
@ -488,7 +487,7 @@ proc onSlotStart(node: BeaconNode, lastSlot, scheduledSlot: Slot) {.gcsafe, asyn
# disappear naturally - risky because user is not aware,
# and might lose stake on canonical chain but "just works"
# when reconnected..
var head = node.updateHead(slot)
discard node.updateHead(slot)
# TODO is the slot of the clock or the head block more interesting? provide
# rationale in comment
@ -524,7 +523,6 @@ proc onSlotStart(node: BeaconNode, lastSlot, scheduledSlot: Slot) {.gcsafe, asyn
proc handleMissingBlocks(node: BeaconNode) =
let missingBlocks = node.quarantine.checkMissing()
if missingBlocks.len > 0:
var left = missingBlocks.len
info "Requesting detected missing blocks", blocks = shortLog(missingBlocks)
node.requestManager.fetchAncestorBlocks(missingBlocks)
@ -640,7 +638,6 @@ proc installBeaconApiHandlers(rpcServer: RpcServer, node: BeaconNode) =
rpcServer.rpc("getSyncing") do () -> bool:
let
beaconTime = node.beaconClock.now()
wallSlot = currentSlot(node)
headSlot = node.chainDag.head.slot
# FIXME: temporary hack: If more than 1 block away from expected head, then we are "syncing"

View File

@ -74,7 +74,7 @@ const presetValueLoaders = genExpr(nnkBracket):
true
else:
`constType`(`constNameIdent`) == parse(`constType`, presetValue)
except CatchableError as err:
except CatchableError:
false
)