From b6c9de968fd4926f553b94e01d9ab35ce8350201 Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Mon, 25 May 2020 20:33:03 +0300 Subject: [PATCH] Fix some build problems and warnings --- beacon_chain/beacon_node_common.nim | 8 ++++---- beacon_chain/sync_protocol.nim.generated.nim | 2 +- vendor/nim-eth | 2 +- vendor/nim-stew | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/beacon_chain/beacon_node_common.nim b/beacon_chain/beacon_node_common.nim index 6dc186d40..db9b38144 100644 --- a/beacon_chain/beacon_node_common.nim +++ b/beacon_chain/beacon_node_common.nim @@ -16,14 +16,14 @@ import chronicles, # Local modules - spec/[datatypes, crypto, helpers], + spec/[datatypes, crypto, digest, helpers], conf, time, beacon_chain_db, sszdump, attestation_pool, block_pool, eth2_network, beacon_node_types, mainchain_monitor, request_manager -# TODO figure out how to silence the `unused pragma` warning for specific builds of this -# https://discordapp.com/channels/613988663034118151/614014714590134292/713053239297179668 -import spec/digest +# This removes an invalid Nim warning that the digest module is unused here +# It's currently used for `shortLog(head.blck.root)` +type Eth2Digest = digest.Eth2Digest type RpcServer* = RpcHttpServer diff --git a/beacon_chain/sync_protocol.nim.generated.nim b/beacon_chain/sync_protocol.nim.generated.nim index 1d7cd069a..276dc49c2 100644 --- a/beacon_chain/sync_protocol.nim.generated.nim +++ b/beacon_chain/sync_protocol.nim.generated.nim @@ -83,7 +83,7 @@ var BeaconSyncProtocolObj = initProtocol("BeaconSync", createPeerState[Peer, ref[BeaconSyncPeerState:ObjectType]], createNetworkState[Eth2Node, ref[BeaconSyncNetworkState:ObjectType]]) var BeaconSyncProtocol = addr BeaconSyncProtocolObj -template protocolInfo*(P`gensym187610300: type BeaconSync): auto = +template protocolInfo*(PROTO: type BeaconSync): auto = BeaconSyncProtocol proc status*(peer: Peer; theirStatus: StatusMsg; diff --git a/vendor/nim-eth b/vendor/nim-eth index 218192aa0..ff546d27c 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit 218192aa0900518ebc65a1d53efb3be0667628c5 +Subproject commit ff546d27c3e65df806e499a17e1918a545522094 diff --git a/vendor/nim-stew b/vendor/nim-stew index a333eb080..cf837b3fb 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit a333eb080f89a035415a17d583a651d40b309b12 +Subproject commit cf837b3fb6108f666c76523688178d3c2dd9ba93