Fix some obsolete paths and delete obsolete scripts

Makefile

@@ -71,13 +71,13 @@ 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) scripts/build_testnet_node.sh $@
+	$(ENV_SCRIPT) nim scripts/connect_to_testnet.nims $@
 
 clean-testnet0:
-	rm -rf ~/.cache/nimbus/BeaconNode/testnet0
+	rm -rf build/data/nimbus_testnet0
 
 clean-testnet1:
-	rm -rf ~/.cache/nimbus/BeaconNode/testnet1
+	rm -rf build/data/nimbus_testnet1
 
 clean: | clean-common
 	rm -rf build/{$(TOOLS_CSV),all_tests,*_node}

docker/manage_testnet_hosts.nims

@@ -61,7 +61,7 @@ of redist_validators:
       keysList.add " "
       keysList.add conf.depositsDir / validatorKey
 
-    let dockerPath = &"/docker/{n.container}/data/BeaconNode/{conf.network}"
+    let dockerPath = &"/docker/{n.container}/data/BeaconNode"
     echo &"echo Distributing keys {n.firstValidator}..{n.lastValidator} to container {n.container}@{n.server} ... && \\"
     echo &"  ssh {n.server} 'sudo rm -rf /tmp/nimbus && mkdir -p /tmp/nimbus' && \\"
     echo &"  rsync {networkDataFiles} {n.server}:/tmp/nimbus/net-data/ && \\"

scripts/build_testnet_node.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-
-[ -z "$1" ] && { echo "Usage: `basename $0` testnetX"; exit 1; }
-
-set -e
-
-cd $(dirname "$0")
-
-NETWORK_NAME="$1"
-source "$NETWORK_NAME.env"
-
-cd ..
-
-# the NIM_PARAMS env var will be set in the Makefile, based on NIMFLAGS passed on the `make` command line
-# (i.e.: make NIMFLAGS="--stackTrace:on" testnet1).
-OUR_NIM_FLAGS="-d:release --lineTrace:on -d:chronicles_log_level=DEBUG -d:const_preset=$CONST_PRESET -d:network_type=$NETWORK_TYPE -d:SECONDS_PER_SLOT=$SECONDS_PER_SLOT -d:SHARD_COUNT=$SHARD_COUNT -d:SLOTS_PER_EPOCH=$SLOTS_PER_EPOCH -d:DEFAULT_NETWORK=$NETWORK_NAME $NIM_PARAMS"
-
-BEACON_NODE_BIN="build/${NETWORK_NAME}_node"
-
-CMD="nim c $OUR_NIM_FLAGS -o:$BEACON_NODE_BIN beacon_chain/beacon_node"
-echo "$CMD"
-$CMD
-
-# simple wrapper script
-BEACON_NODE_SCRIPT="scripts/${NETWORK_NAME}.sh"
-cat > "$BEACON_NODE_SCRIPT" <<EOF
-#!/bin/bash
-
-cd \$(dirname "\$0")/..
-vendor/nimbus-build-system/scripts/env.sh $BEACON_NODE_BIN "\$@"
-EOF
-chmod 755 "$BEACON_NODE_SCRIPT"
-
-echo
-echo "Done! You're now ready to connect to $NETWORK_NAME by running:"
-echo
-echo "    $BEACON_NODE_SCRIPT"
-echo
-echo "Database and configuration files will be placed in:"
-echo
-echo "    ${HOME}/.cache/nimbus/BeaconNode/${NETWORK_NAME}"
-echo

scripts/reset_testnet.sh

@@ -111,7 +111,7 @@ if [[ $PUBLISH_TESTNET_RESETS != "0" ]]; then
   bash /tmp/reset-network.sh
 
   echo Uploading bootstrap node network key
-  BOOTSTRAP_NODE_DOCKER_PATH=/docker/beacon-node-$NETWORK_NAME-1/data/BeaconNode/$NETWORK_NAME/
+  BOOTSTRAP_NODE_DOCKER_PATH=/docker/beacon-node-$NETWORK_NAME-1/data/BeaconNode/
   scp "$DATA_DIR_ABS/privkey.protobuf" $BOOTSTRAP_HOST:/tmp/
   ssh $BOOTSTRAP_HOST "sudo install -o dockremap -g docker /tmp/privkey.protobuf $BOOTSTRAP_NODE_DOCKER_PATH"