From 7d708be121b670fb4dfdc55d02906e50a3f87768 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 2 Jul 2018 16:10:55 -0700
Subject: [PATCH] Drone now grabs mint.json locally

---
 multinode-demo/common.sh |  1 +
 multinode-demo/drone.sh  | 10 ++++++++--
 multinode-demo/setup.sh  | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index dbd0ab9ab..5a0f4ab4e 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -53,6 +53,7 @@ export RUST_BACKTRACE=1
 [[ $(uname) = Linux ]] && (set -x; sudo sysctl -w net.core.rmem_max=26214400 1>/dev/null 2>/dev/null)
 
 SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
+SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private
 
 rsync_url() { # adds the 'rsync://` prefix to URLs that need it
   declare url="$1"
diff --git a/multinode-demo/drone.sh b/multinode-demo/drone.sh
index 74f7dcdfa..c5515a24a 100755
--- a/multinode-demo/drone.sh
+++ b/multinode-demo/drone.sh
@@ -24,12 +24,18 @@ else
   leader=${1:-${here}/..}  # Default to local solana repo
 fi
 
+[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json ]] || {
+  echo "$SOLANA_CONFIG_PRIVATE_DIR/mint.json not found, create it by running:"
+  echo
+  echo "  ${here}/setup.sh -t leader"
+  exit 1
+}
+
 rsync_leader_url=$(rsync_url "$leader")
 set -ex
 mkdir -p $SOLANA_CONFIG_DIR
 $rsync -vPz "$rsync_leader_url"/config/leader.json $SOLANA_CONFIG_DIR/
-$rsync -vPz "$rsync_leader_url"/config-private/mint.json $SOLANA_CONFIG_DIR/
 
 # shellcheck disable=SC2086 # $solana_drone should not be quoted
 exec $solana_drone \
-  -l $SOLANA_CONFIG_DIR/leader.json < $SOLANA_CONFIG_DIR/mint.json
+  -l $SOLANA_CONFIG_DIR/leader.json < $SOLANA_CONFIG_PRIVATE_DIR/mint.json
diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh
index 01c006b47..7c0e26899 100755
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -80,14 +80,14 @@ mkdir -p "$SOLANA_CONFIG_DIR"
 
 
 if $node_type_leader; then
-  rm -rvf "$SOLANA_CONFIG_DIR"-private
-  mkdir -p "$SOLANA_CONFIG_DIR"-private
+  rm -rvf "$SOLANA_CONFIG_PRIVATE_DIR"
+  mkdir -p "$SOLANA_CONFIG_PRIVATE_DIR"
 
   echo "Creating $SOLANA_CONFIG_DIR/mint.json with $num_tokens tokens"
-  $solana_mint <<<"$num_tokens" > "$SOLANA_CONFIG_DIR"-private/mint.json
+  $solana_mint <<<"$num_tokens" > "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json
 
   echo "Creating $SOLANA_CONFIG_DIR/genesis.log"
-  $solana_genesis < "$SOLANA_CONFIG_DIR"-private/mint.json > "$SOLANA_CONFIG_DIR"/genesis.log
+  $solana_genesis < "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json > "$SOLANA_CONFIG_DIR"/genesis.log
 
   echo "Creating $SOLANA_CONFIG_DIR/leader.json"
   $solana_fullnode_config "${leader_address_args[@]}" > "$SOLANA_CONFIG_DIR"/leader.json
@@ -101,5 +101,5 @@ fi
 
 ls -lh "$SOLANA_CONFIG_DIR"/
 if $node_type_leader; then
-  ls -lh "$SOLANA_CONFIG_DIR"-private/
+  ls -lh "$SOLANA_CONFIG_PRIVATE_DIR"
 fi