From 14cffdea99c1122a0a2fa32025fda1a70efcf4b1 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Mon, 23 Mar 2020 12:51:04 +0200
Subject: [PATCH] Don't create a separate bootstrap_node binary

---
 tests/simulation/run_node.sh | 7 +------
 tests/simulation/start.sh    | 3 ---
 tests/simulation/vars.sh     | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tests/simulation/run_node.sh b/tests/simulation/run_node.sh
index fbaccc068..0521c765a 100755
--- a/tests/simulation/run_node.sh
+++ b/tests/simulation/run_node.sh
@@ -47,13 +47,8 @@ fi
 rm -rf "$DATA_DIR/dump"
 mkdir -p "$DATA_DIR/dump"
 
-NODE_BIN=$BEACON_NODE_BIN
-if [[ $NODE_ID == $MASTER_NODE ]]; then
-  NODE_BIN=$BOOTSTRAP_NODE_BIN
-fi
-
 # if you want tracing messages, add "--log-level=TRACE" below
-cd "$DATA_DIR" && $NODE_BIN \
+cd "$DATA_DIR" && $BEACON_NODE_BIN \
   --log-level=${LOG_LEVEL:-DEBUG} \
   --bootstrap-file=$BOOTSTRAP_ADDRESS_FILE \
   --data-dir=$DATA_DIR \
diff --git a/tests/simulation/start.sh b/tests/simulation/start.sh
index 314ba3192..9fa86b311 100755
--- a/tests/simulation/start.sh
+++ b/tests/simulation/start.sh
@@ -41,9 +41,6 @@ build_beacon_node () {
 
 build_beacon_node $BEACON_NODE_BIN
 
-# DAEMON TODO: This copy is now unnecessary
-cp $BEACON_NODE_BIN $BOOTSTRAP_NODE_BIN
-
 if [ ! -f "${LAST_VALIDATOR}" ]; then
   echo Building $DEPLOY_DEPOSIT_CONTRACT_BIN
   $MAKE NIMFLAGS="-o:\"$DEPLOY_DEPOSIT_CONTRACT_BIN\" $CUSTOM_NIMFLAGS $DEFS" deposit_contract
diff --git a/tests/simulation/vars.sh b/tests/simulation/vars.sh
index f3837a495..a7d2dce73 100644
--- a/tests/simulation/vars.sh
+++ b/tests/simulation/vars.sh
@@ -31,7 +31,6 @@ VALIDATORS_DIR="${SIM_ROOT}/validators"
 SNAPSHOT_FILE="${SIMULATION_DIR}/state_snapshot.ssz"
 NETWORK_BOOTSTRAP_FILE="${SIMULATION_DIR}/bootstrap_nodes.txt"
 BEACON_NODE_BIN="${SIMULATION_DIR}/beacon_node"
-BOOTSTRAP_NODE_BIN="${SIMULATION_DIR}/bootstrap_node"
 DEPLOY_DEPOSIT_CONTRACT_BIN="${SIMULATION_DIR}/deploy_deposit_contract"
 MASTER_NODE_PID_FILE="${SIMULATION_DIR}/node-${MASTER_NODE}/beacon_node.pid"