status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-17 08:56:45 +00:00
Code Issues Projects Releases Wiki Activity

fix ProveField warning in network_metadata (#5476)

Browse Source 
Spurious `ProveField` warning can be avoided by using `case` instead of
`if` on `metadata.genesis.kind`. Also suppress `GlobalVar` hints when
`incbinEnabled` is used, which has global `let` definitions.
This commit is contained in:
Etan Kissling 2023-10-04 10:19:05 +02:00 committed by GitHub
parent 4d20b4a6c6
commit 24c68bbcf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_chain/networking/network_metadata.nim
View File

@ -281,6 +281,7 @@ elif const_preset == "mainnet":
when incbinEnabled: when incbinEnabled:
# Nim is very inefficent at loading large constants from binary files so we # Nim is very inefficent at loading large constants from binary files so we
# use this trick instead which saves significant amounts of compile time # use this trick instead which saves significant amounts of compile time
{.push hint[GlobalVar]:off.}
let let
mainnetGenesis* {.importc: "eth2_mainnet_genesis".}: ptr UncheckedArray[byte] mainnetGenesis* {.importc: "eth2_mainnet_genesis".}: ptr UncheckedArray[byte]
mainnetGenesisSize* {.importc: "eth2_mainnet_genesis_size".}: int mainnetGenesisSize* {.importc: "eth2_mainnet_genesis_size".}: int
@ -290,6 +291,7 @@ elif const_preset == "mainnet":
sepoliaGenesis* {.importc: "eth2_sepolia_genesis".}: ptr UncheckedArray[byte] sepoliaGenesis* {.importc: "eth2_sepolia_genesis".}: ptr UncheckedArray[byte]
sepoliaGenesisSize* {.importc: "eth2_sepolia_genesis_size".}: int sepoliaGenesisSize* {.importc: "eth2_sepolia_genesis_size".}: int
{.pop.}
# let `.incbin` in assembly file find the binary file through search path # let `.incbin` in assembly file find the binary file through search path
{.passc: "-I" & vendorDir.} {.passc: "-I" & vendorDir.}
@ -465,7 +467,8 @@ when const_preset in ["mainnet", "gnosis"]:
raiseAssert "The baked network metadata should use one of the name above" raiseAssert "The baked network metadata should use one of the name above"
func bakedGenesisValidatorsRoot*(metadata: Eth2NetworkMetadata): Opt[Eth2Digest] = func bakedGenesisValidatorsRoot*(metadata: Eth2NetworkMetadata): Opt[Eth2Digest] =
if metadata.genesis.kind == BakedIn: case metadata.genesis.kind
of BakedIn:
try: try:
let header = SSZ.decode( let header = SSZ.decode(
toOpenArray(metadata.genesis.bakedBytes, 0, sizeof(BeaconStateHeader) - 1), toOpenArray(metadata.genesis.bakedBytes, 0, sizeof(BeaconStateHeader) - 1),