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

Merge branch 'master' into bat

This commit is contained in:
Dustin Brody 2019-11-14 19:37:47 +00:00 committed by GitHub
parent 7e70d16da9 a373a86642
commit 3f958d3529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/beacon_node.nim
View File

@ -28,10 +28,6 @@ declareGauge beacon_head_slot,
declareGauge beacon_head_root,
"Root of the head block of the beacon chain"
# https://github.com/ethereum/eth2.0-metrics/blob/master/metrics.md#additional-metrics
declareGauge beacon_pending_exits,
"Number of pending voluntary exits in local operation pool" # On slot
# Metrics for tracking attestation and beacon block loss
declareCounter beacon_attestations_sent,
"Number of beacon chain attestations sent by this peer"
@ -399,7 +395,7 @@ proc proposeBlock(node: BeaconNode,
var
tmpState = hashedState
let ok = state_transition(tmpState, newBlock, {skipValidation})
discard state_transition(tmpState, newBlock, {skipValidation})
# TODO only enable in fast-fail debugging situations
# otherwise, bad attestations can bring down network
# doAssert ok # TODO: err, could this fail somehow?

1
tests/official/test_fixture_sanity_blocks.nim
View File

@ -36,7 +36,6 @@ template runValidTest(testName: string, identifier: untyped, num_blocks: int): u
stateRef[] = parseTest(testDir/"pre.ssz", SSZ, BeaconState)
postRef[] = parseTest(testDir/"post.ssz", SSZ, BeaconState)
var success = true
for i in 0 ..< num_blocks:
let blck = parseTest(testDir/"blocks_" & $i & ".ssz", SSZ, BeaconBlock)

2
tests/official/test_fixture_ssz_consensus_objects.nim
View File

@ -7,7 +7,7 @@
import
# Standard library
os, unittest, strutils, streams, strformat, strscans,
os, unittest, strutils, streams, strformat,
macros, sets,
# Status libraries
stint, stew/bitseqs,

2
vendor/nim-nat-traversal vendored

@ -1 +1 @@
Subproject commit 42c0c5020e4826f8a5aa324c2c77de4804c92436
Subproject commit 68ed95957d614fa91d0b20bdeea3cf876c46c120

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit 351b68fd946f3df136af3c74d1f82a5a232e9934
Subproject commit 798b1019105a80fe0f1b49e9f95a4bbab4c29e70