From ffd4bc1dd4b28073f44e73f1cd498a9324de24b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Thu, 16 Jul 2020 19:04:57 +0200 Subject: [PATCH] launch_local_testnet.sh: make node 0 the bootstrap node --- Jenkinsfile | 2 +- beacon_chain/sync_protocol.nim.generated.nim | 2 +- scripts/launch_local_testnet.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb775b743..0d2da7bf8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ def runStages() { if ("${NODE_NAME}" ==~ /linux.*/) { sh """#!/bin/bash for D in local_testnet0_data local_testnet1_data; do - [[ -d "\$D" ]] && tar cjf "\${D}.tar.bz2" "\${D}"/*.txt + [[ -d "\$D" ]] && tar cjf "\${D}.tar.bz2" "\${D}"/*.txt || true done """ archiveArtifacts("*.tar.bz2") diff --git a/beacon_chain/sync_protocol.nim.generated.nim b/beacon_chain/sync_protocol.nim.generated.nim index 1ed654751..c9c7d1653 100644 --- a/beacon_chain/sync_protocol.nim.generated.nim +++ b/beacon_chain/sync_protocol.nim.generated.nim @@ -1,5 +1,5 @@ -## Generated at line 94 +## Generated at line 87 type BeaconSync* = object template State*(PROTO: type BeaconSync): type = diff --git a/scripts/launch_local_testnet.sh b/scripts/launch_local_testnet.sh index 8b27bff0b..bd036fca1 100755 --- a/scripts/launch_local_testnet.sh +++ b/scripts/launch_local_testnet.sh @@ -247,11 +247,11 @@ dump_logs() { } NODES_WITH_VALIDATORS=${NODES_WITH_VALIDATORS:-4} -BOOTSTRAP_NODE=$(( NUM_NODES - 1 )) +BOOTSTRAP_NODE=0 SYSTEM_VALIDATORS=$(( TOTAL_VALIDATORS - USER_VALIDATORS )) VALIDATORS_PER_NODE=$(( SYSTEM_VALIDATORS / NODES_WITH_VALIDATORS )) -for NUM_NODE in $(seq $BOOTSTRAP_NODE -1 0); do +for NUM_NODE in $(seq 0 $(( NUM_NODES - 1 ))); do if [[ ${NUM_NODE} == ${BOOTSTRAP_NODE} ]]; then BOOTSTRAP_ARG="" else