rm unused code; fix a Deprecated warning; proc to func (#5807)

This commit is contained in:
tersec 2024-01-20 21:36:01 +00:00 committed by GitHub
parent 042169ac9d
commit d669eef97b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 24 additions and 41 deletions

View File

@ -2260,8 +2260,9 @@ proc createEth2Node*(rng: ref HmacDrbgContext,
hostAddress = tcpEndPoint(
ValidIpAddress.init config.listenAddress, config.tcpPort)
announcedAddresses = if extIp.isNone() or extTcpPort.isNone(): @[]
else: @[tcpEndPoint(ValidIpAddress.init(extIp.get()), extTcpPort.get())]
announcedAddresses =
if extIp.isNone() or extTcpPort.isNone(): @[]
else: @[tcpEndPoint(extIp.get(), extTcpPort.get())]
debug "Initializing networking", hostAddress,
network_public_key = netKeys.pubkey,

View File

@ -425,6 +425,7 @@ proc getRuntimeConfig*(eth2Network: Option[string]): RuntimeConfig =
metadata.cfg
when const_preset in ["mainnet", "gnosis"]:
template bakedInGenesisStateAsBytes(networkName: untyped): untyped =
when incbinEnabled:
`networkName Genesis`.toOpenArray(0, `networkName GenesisSize` - 1)
@ -440,7 +441,6 @@ const
"Baked-in genesis states for the Gnosis network " &
"are available only in the gnosis build of Nimbus"
when const_preset in ["mainnet", "gnosis"]:
template bakedBytes*(metadata: GenesisMetadata): auto =
case metadata.networkName
of "mainnet":

View File

@ -1153,7 +1153,7 @@ proc maybeUpdateActionTrackerNextEpoch(
#
# There are no penalties associated with TIMELY_HEAD_FLAG_INDEX, but a
# reward exists. effective_balance == MAX_EFFECTIVE_BALANCE ensures if
# even so, then the effective balanace cannot change as a result.
# even so, then the effective balance cannot change as a result.
#
# It's not truly necessary to avoid all rewards and penalties, but only
# to bound them to ensure they won't unexpected alter effective balance

View File

@ -709,16 +709,6 @@ template firstSuccessSequential*(
if exitNow:
break
proc getIndexedErrorMessage(response: RestPlainResponse): string =
let res = decodeBytes(RestIndexedErrorMessage, response.data,
response.contentType)
if res.isOk():
let errorObj = res.get()
let failures = errorObj.failures.mapIt($it.index & ": " & it.message)
errorObj.message & ": [" & failures.join(", ") & "]"
else:
"Unable to decode error response: [" & $res.error & "]"
proc getErrorMessage*(response: RestPlainResponse): string =
let res = decodeBytes(RestErrorMessage, response.data,
response.contentType)

View File

@ -1011,7 +1011,6 @@ proc getValidatorRegistration(
return err(RegistrationKind.MissingIndex)
let
vindex = validator.index.get()
cached = vc.validatorsRegCache.getOrDefault(validator.pubkey)
currentSlot =
block:

View File

@ -77,7 +77,7 @@ type
process: AsyncProcessRef
reader: Future[seq[byte]]
proc getNodePort(basePort: int, rt: RemoteSignerType): int =
func getNodePort(basePort: int, rt: RemoteSignerType): int =
# Individual port numbers derived by adding to configurable base port
case rt
of RemoteSignerType.Web3Signer:
@ -118,7 +118,7 @@ proc getBlock(fork: ConsensusFork,
$fork).tryGet()
ForkedBeaconBlock.init(b)
proc init(t: typedesc[Web3SignerForkedBeaconBlock],
func init(t: typedesc[Web3SignerForkedBeaconBlock],
forked: ForkedBeaconBlock): Web3SignerForkedBeaconBlock =
case forked.kind
of ConsensusFork.Phase0, ConsensusFork.Altair:
@ -192,7 +192,7 @@ proc createDataDir(pathName: string): Result[void, string] =
KeystorePassword)
ok()
proc getTestDir(rt: RemoteSignerType): string =
func getTestDir(rt: RemoteSignerType): string =
case rt
of RemoteSignerType.Web3Signer:
TestDirectoryName
@ -225,14 +225,7 @@ proc removeTestDir(rt: RemoteSignerType) =
discard removeDir(signingDir)
discard removeDir(pathName)
proc getPrivateKey(data: string): Result[ValidatorPrivKey, string] =
var key: blscurve.SecretKey
if fromHex(key, data):
ok(ValidatorPrivKey(key))
else:
err("Unable to initialize private key")
proc getLocalKeystoreData(data: string): Result[KeystoreData, string] =
func getLocalKeystoreData(data: string): Result[KeystoreData, string] =
let privateKey =
block:
var key: blscurve.SecretKey
@ -246,7 +239,7 @@ proc getLocalKeystoreData(data: string): Result[KeystoreData, string] =
version: uint64(4),
pubkey: privateKey.toPubKey().toPubKey())
proc getRemoteKeystoreData(data: string, basePort: int,
func getRemoteKeystoreData(data: string, basePort: int,
rt: RemoteSignerType): Result[KeystoreData, string] =
let
publicKey = ValidatorPubKey.fromHex(data).valueOr: