From c0f9e452f2a0dc14e39f0fb9ab0b64d672c1fff9 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 2 Jul 2018 07:49:14 -0700
Subject: [PATCH] mint.json is now private

---
 .gitignore               |  1 +
 multinode-demo/client.sh |  2 +-
 multinode-demo/drone.sh  |  2 +-
 multinode-demo/setup.sh  | 11 +++++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69790d143..8c4a32a05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ Cargo.lock
 
 # node configuration files
 /config/
+/config-private/
 /config-drone/
 /config-validator/
 /config-client-demo/
diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh
index 79493abdc..9d9f86560 100755
--- a/multinode-demo/client.sh
+++ b/multinode-demo/client.sh
@@ -16,7 +16,7 @@ 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/mint.json $SOLANA_CONFIG_DIR/
+rsync -vPz "$rsync_leader_url"/config-private/mint.json $SOLANA_CONFIG_DIR/
 
 # shellcheck disable=SC2086 # $solana_client_demo should not be quoted
 exec $solana_client_demo \
diff --git a/multinode-demo/drone.sh b/multinode-demo/drone.sh
index 8c40f80c4..d2677dd11 100755
--- a/multinode-demo/drone.sh
+++ b/multinode-demo/drone.sh
@@ -28,7 +28,7 @@ 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/mint.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 \
diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh
index 89d11821a..dde6f7df8 100755
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -44,14 +44,17 @@ validator_address_args=("$ip_address_arg" -b 9000)
 set -e
 
 echo "Cleaning $SOLANA_CONFIG_DIR"
-rm -rvf "$SOLANA_CONFIG_DIR"
-mkdir -p "$SOLANA_CONFIG_DIR"
+(
+  set -x
+  rm -rvf "$SOLANA_CONFIG_DIR"{,-private}
+  mkdir -p "$SOLANA_CONFIG_DIR"{,-private}
+)
 
 echo "Creating $SOLANA_CONFIG_DIR/mint.json with $num_tokens tokens"
-$solana_mint <<<"$num_tokens" > "$SOLANA_CONFIG_DIR"/mint.json
+$solana_mint <<<"$num_tokens" > "$SOLANA_CONFIG_DIR"-private/mint.json
 
 echo "Creating $SOLANA_CONFIG_DIR/genesis.log"
-$solana_genesis < "$SOLANA_CONFIG_DIR"/mint.json > "$SOLANA_CONFIG_DIR"/genesis.log
+$solana_genesis < "$SOLANA_CONFIG_DIR"-private/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