Remove some confusing code duplication; Use multiple nodes by default in the network sim

This commit is contained in:
Zahary Karadjov 2019-08-15 19:04:16 +02:00
parent 2fca9465e7
commit 93336daf7f
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
2 changed files with 2 additions and 9 deletions

View File

@ -5,18 +5,11 @@ set -euo pipefail
# Read in variables # Read in variables
. "$(dirname "$0")/vars.sh" . "$(dirname "$0")/vars.sh"
# Set a default value for the env vars usually supplied by nimbus Makefile
export NUM_VALIDATORS=${VALIDATORS:-721}
export NUM_NODES=${NODES:-1}
export NUM_MISSING_NODES=${MISSING_NODES:-0}
# Set DEPOSIT_WEB3_URL_ARG to empty to get genesis state from file, not using web3 # Set DEPOSIT_WEB3_URL_ARG to empty to get genesis state from file, not using web3
# export DEPOSIT_WEB3_URL_ARG=--depositWeb3Url=ws://localhost:8545 # export DEPOSIT_WEB3_URL_ARG=--depositWeb3Url=ws://localhost:8545
export DEPOSIT_WEB3_URL_ARG= export DEPOSIT_WEB3_URL_ARG=
export DEPOSIT_CONTRACT_ADDRESS=0x export DEPOSIT_CONTRACT_ADDRESS=0x
cd "$SIM_ROOT" cd "$SIM_ROOT"
mkdir -p "$SIMULATION_DIR" mkdir -p "$SIMULATION_DIR"
mkdir -p "$VALIDATORS_DIR" mkdir -p "$VALIDATORS_DIR"

View File

@ -14,8 +14,8 @@ cd - &>/dev/null
: ${SKIP_BUILDS:=""} : ${SKIP_BUILDS:=""}
: ${BUILD_OUTPUTS_DIR:="$GIT_ROOT/build"} : ${BUILD_OUTPUTS_DIR:="$GIT_ROOT/build"}
NUM_VALIDATORS=${VALIDATORS:-721} NUM_VALIDATORS=${VALIDATORS:-1000}
NUM_NODES=${NODES:-1} NUM_NODES=${NODES:-2}
NUM_MISSING_NODES=${MISSING_NODES:-0} NUM_MISSING_NODES=${MISSING_NODES:-0}
SIMULATION_DIR="${SIM_ROOT}/data" SIMULATION_DIR="${SIM_ROOT}/data"