Fix test.

This commit is contained in:
cheatfate 2024-03-11 04:03:17 +02:00
parent a034d5c42d
commit 4948b2c1ec
No known key found for this signature in database
GPG Key ID: 46ADD633A7201F95

View File

@ -6,6 +6,7 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
{.used.} {.used.}
{.push raises: [].}
import import
std/[typetraits, os, options, json, sequtils, uri, algorithm], std/[typetraits, os, options, json, sequtils, uri, algorithm],
@ -116,7 +117,7 @@ func contains*(keylist: openArray[KeystoreInfo], key: ValidatorPubKey): bool =
false false
func contains*(keylist: openArray[KeystoreInfo], key: string): bool = func contains*(keylist: openArray[KeystoreInfo], key: string): bool =
let pubkey = ValidatorPubKey.fromHex(key).tryGet() let pubkey = ValidatorPubKey.fromHex(key).get()
contains(keylist, pubkey) contains(keylist, pubkey)
proc prepareNetwork = proc prepareNetwork =
@ -155,7 +156,11 @@ proc prepareNetwork =
let launchPadDeposits = let launchPadDeposits =
mapIt(deposits.value, LaunchPadDeposit.init(cfg, it)) mapIt(deposits.value, LaunchPadDeposit.init(cfg, it))
Json.saveFile(depositsFile, launchPadDeposits) try:
Json.saveFile(depositsFile, launchPadDeposits)
except CatchableError as exc:
raiseAssert exc.msg
notice "Deposit data written", filename = depositsFile notice "Deposit data written", filename = depositsFile
let runtimeConfigWritten = secureWriteFile(runtimeConfigFile, """ let runtimeConfigWritten = secureWriteFile(runtimeConfigFile, """
@ -183,7 +188,10 @@ BELLATRIX_FORK_EPOCH: 0
except Exception as exc: # TODO Fix confutils exceptions except Exception as exc: # TODO Fix confutils exceptions
raiseAssert exc.msg raiseAssert exc.msg
doCreateTestnet(createTestnetConf, rng[]) try:
doCreateTestnet(createTestnetConf, rng[])
except CatchableError as exc:
raiseAssert exc.msg
let tokenFileRes = secureWriteFile(tokenFilePath, correctTokenValue) let tokenFileRes = secureWriteFile(tokenFilePath, correctTokenValue)
if tokenFileRes.isErr: if tokenFileRes.isErr:
@ -209,60 +217,63 @@ proc copyHalfValidators(dstDataDir: string, firstHalf: bool) =
path = dstSecretsDir, err = ioErrorMsg(status.error) path = dstSecretsDir, err = ioErrorMsg(status.error)
quit 1 quit 1
var validatorIdx = 0 try:
for validator in walkDir(validatorsDir): var validatorIdx = 0
if (validatorIdx < simulationDepositsCount div 2) == firstHalf: for validator in walkDir(validatorsDir):
let if (validatorIdx < simulationDepositsCount div 2) == firstHalf:
currValidator = os.splitPath(validator.path).tail let
secretFile = secretsDir / currValidator currValidator = os.splitPath(validator.path).tail
secretRes = readAllChars(secretFile) secretFile = secretsDir / currValidator
secretRes = readAllChars(secretFile)
if secretRes.isErr: if secretRes.isErr:
fatal "Failed to read secret file", fatal "Failed to read secret file",
path = secretFile, err = $secretRes.error path = secretFile, err = $secretRes.error
quit 1 quit 1
let let
dstSecretFile = dstSecretsDir / currValidator dstSecretFile = dstSecretsDir / currValidator
secretFileStatus = secureWriteFile(dstSecretFile, secretRes.get) secretFileStatus = secureWriteFile(dstSecretFile, secretRes.get)
if secretFileStatus.isErr: if secretFileStatus.isErr:
fatal "Failed to write secret file", fatal "Failed to write secret file",
path = dstSecretFile, err = $secretFileStatus.error path = dstSecretFile, err = $secretFileStatus.error
quit 1 quit 1
let let
dstValidatorDir = dstDataDir / "validators" / currValidator dstValidatorDir = dstDataDir / "validators" / currValidator
validatorDirRes = secureCreatePath(dstValidatorDir) validatorDirRes = secureCreatePath(dstValidatorDir)
if validatorDirRes.isErr: if validatorDirRes.isErr:
fatal "Failed to create validator dir", fatal "Failed to create validator dir",
path = dstValidatorDir, err = $validatorDirRes.error path = dstValidatorDir, err = $validatorDirRes.error
quit 1 quit 1
let let
keystoreFile = validatorsDir / currValidator / "keystore.json" keystoreFile = validatorsDir / currValidator / "keystore.json"
readKeystoreRes = readAllChars(keystoreFile) readKeystoreRes = readAllChars(keystoreFile)
if readKeystoreRes.isErr: if readKeystoreRes.isErr:
fatal "Failed to read keystore file", fatal "Failed to read keystore file",
path = keystoreFile, err = $readKeystoreRes.error path = keystoreFile, err = $readKeystoreRes.error
quit 1 quit 1
let let
dstKeystore = dstValidatorDir / "keystore.json" dstKeystore = dstValidatorDir / "keystore.json"
writeKeystoreRes = secureWriteFile(dstKeystore, readKeystoreRes.get) writeKeystoreRes = secureWriteFile(dstKeystore, readKeystoreRes.get)
if writeKeystoreRes.isErr: if writeKeystoreRes.isErr:
fatal "Failed to write keystore file", fatal "Failed to write keystore file",
path = dstKeystore, err = $writeKeystoreRes.error path = dstKeystore, err = $writeKeystoreRes.error
quit 1 quit 1
inc validatorIdx inc validatorIdx
except CatchableError as exc:
raiseAssert exc.msg
proc addPreTestRemoteKeystores(validatorsDir: string) = proc addPreTestRemoteKeystores(validatorsDir: string) =
for item in oldPublicKeys: for item in oldPublicKeys:
let key = ValidatorPubKey.fromHex(item).tryGet() let key = ValidatorPubKey.fromHex(item).get()
let res = saveKeystore(validatorsDir, key, oldPublicKeysUrl) let res = saveKeystore(validatorsDir, key, oldPublicKeysUrl)
if res.isErr(): if res.isErr():
fatal "Failed to create remote keystore file", fatal "Failed to create remote keystore file",