From 6c021f8c12ba6e19c62b7e3285951f289a2469bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Tue, 12 Nov 2019 15:57:33 +0100 Subject: [PATCH] connect_to_testnet.nims: fix warning and enforce verbosity [skip ci] --- Makefile | 2 +- scripts/connect_to_testnet.nims | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 980f29a55..0de60a9e2 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ eth2_network_simulation: | build deps p2pd clean_eth2_network_simulation_files p GIT_ROOT="$$PWD" tests/simulation/start.sh testnet0 testnet1: | build deps - NIM_PARAMS="$(NIM_PARAMS)" $(ENV_SCRIPT) nim scripts/connect_to_testnet.nims $@ + NIM_PARAMS="$(NIM_PARAMS)" $(ENV_SCRIPT) nim $(NIM_PARAMS) scripts/connect_to_testnet.nims $@ clean-testnet0: rm -rf build/data/nimbus_testnet0 diff --git a/scripts/connect_to_testnet.nims b/scripts/connect_to_testnet.nims index 41f62e06b..e66476b9f 100644 --- a/scripts/connect_to_testnet.nims +++ b/scripts/connect_to_testnet.nims @@ -1,5 +1,5 @@ import - confutils, strutils, strformat, ospaths + confutils, strutils, strformat, os const rootDir = thisDir() / ".." @@ -36,13 +36,13 @@ cli do (testnetName {.argument.}: string): exec &"git clone --quiet --depth=1 {testnetsGitUrl}" let testnetDir = allTestnetsDir / team / testnet - if not dirExists(testnetDir): + if not system.dirExists(testnetDir): echo &"No metadata files exists for the '{testnetName}' testnet" quit 1 proc checkRequiredFile(fileName: string) = let filePath = testnetDir / fileName - if not fileExists(filePath): + if not system.fileExists(filePath): echo &"The required file {fileName} is not present in '{testnetDir}'." quit 1 @@ -50,7 +50,7 @@ cli do (testnetName {.argument.}: string): checkRequiredFile genesisFile var preset = testnetDir / configFile - if not fileExists(preset): preset = "minimal" + if not system.fileExists(preset): preset = "minimal" let dataDirName = testnetName.replace("/", "_") @@ -60,11 +60,11 @@ cli do (testnetName {.argument.}: string): var depositContractOpt = "" let depositContractFile = testnetDir / depositContractFile - if fileExists(depositContractFile): + if system.fileExists(depositContractFile): depositContractOpt = "--deposit-contract=" & readFile(depositContractFile).strip - if dirExists(dataDir): - if fileExists(dataDir/genesisFile): + if system.dirExists(dataDir): + if system.fileExists(dataDir/genesisFile): let localGenesisContent = readFile(dataDir/genesisFile) let testnetGenesisContent = readFile(testnetDir/genesisFile) if localGenesisContent != testnetGenesisContent: