From b4850fbb068d795b7ae5c9b282d400ee4eb90fc6 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Thu, 14 Nov 2019 15:24:59 +0100 Subject: [PATCH 1/2] remove XDeclaredButNotUsed spam --- beacon_chain/beacon_node.nim | 6 +----- tests/official/test_fixture_operations_deposits.nim | 4 ++-- tests/official/test_fixture_sanity_blocks.nim | 1 - tests/official/test_fixture_ssz_consensus_objects.nim | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim index 77b573dd6..0f1081815 100644 --- a/beacon_chain/beacon_node.nim +++ b/beacon_chain/beacon_node.nim @@ -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? diff --git a/tests/official/test_fixture_operations_deposits.nim b/tests/official/test_fixture_operations_deposits.nim index 58407bdb5..27dd8bec9 100644 --- a/tests/official/test_fixture_operations_deposits.nim +++ b/tests/official/test_fixture_operations_deposits.nim @@ -59,9 +59,9 @@ template runTest(testName: string, identifier: untyped) = if postRef.isNil: expect(AssertionError): - let done = process_deposit(sr_pre[], depositRef[], flags) + discard process_deposit(sr_pre[], depositRef[], flags) else: - let done = process_deposit(sr_pre[], depositRef[], flags) + discard process_deposit(sr_pre[], depositRef[], flags) reportDiff(sr_pre, sr_post) `testImpl _ operations_deposits _ identifier`() diff --git a/tests/official/test_fixture_sanity_blocks.nim b/tests/official/test_fixture_sanity_blocks.nim index f25a83a78..2e984a906 100644 --- a/tests/official/test_fixture_sanity_blocks.nim +++ b/tests/official/test_fixture_sanity_blocks.nim @@ -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) diff --git a/tests/official/test_fixture_ssz_consensus_objects.nim b/tests/official/test_fixture_ssz_consensus_objects.nim index 8f79e00e9..eaa53630c 100644 --- a/tests/official/test_fixture_ssz_consensus_objects.nim +++ b/tests/official/test_fixture_ssz_consensus_objects.nim @@ -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, From 99164bbfddd5c97744f443edf8c80864f93a5599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Thu, 14 Nov 2019 17:52:01 +0100 Subject: [PATCH 2/2] bump vendor/nim-nat-traversal and vendor/nimbus-build-system --- vendor/nim-nat-traversal | 2 +- vendor/nimbus-build-system | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal index 42c0c5020..68ed95957 160000 --- a/vendor/nim-nat-traversal +++ b/vendor/nim-nat-traversal @@ -1 +1 @@ -Subproject commit 42c0c5020e4826f8a5aa324c2c77de4804c92436 +Subproject commit 68ed95957d614fa91d0b20bdeea3cf876c46c120 diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system index 351b68fd9..798b10191 160000 --- a/vendor/nimbus-build-system +++ b/vendor/nimbus-build-system @@ -1 +1 @@ -Subproject commit 351b68fd946f3df136af3c74d1f82a5a232e9934 +Subproject commit 798b1019105a80fe0f1b49e9f95a4bbab4c29e70