From 8f0a1e32d50df35f48ae70ee3720f41b9f711f80 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 6 Dec 2018 13:48:59 -0800 Subject: [PATCH] Use consistent naming for the mint id file --- multinode-demo/drone.sh | 6 +++--- multinode-demo/setup.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/multinode-demo/drone.sh b/multinode-demo/drone.sh index ad865b030..b98cc6030 100755 --- a/multinode-demo/drone.sh +++ b/multinode-demo/drone.sh @@ -19,8 +19,8 @@ usage() { exit 1 } -[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json ]] || { - echo "$SOLANA_CONFIG_PRIVATE_DIR/mint.json not found, create it by running:" +[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json ]] || { + echo "$SOLANA_CONFIG_PRIVATE_DIR/mint-id.json not found, create it by running:" echo echo " ${here}/setup.sh -t leader" exit 1 @@ -30,7 +30,7 @@ set -ex trap 'kill "$pid" && wait "$pid"' INT TERM $solana_drone \ - --keypair "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json \ + --keypair "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json \ > >($drone_logger) 2>&1 & pid=$! wait "$pid" diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh index d9cff9644..04208f011 100755 --- a/multinode-demo/setup.sh +++ b/multinode-demo/setup.sh @@ -83,12 +83,12 @@ done if $node_type_leader; then leader_address_args=("$ip_address_arg") leader_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/leader-id.json - mint_path="$SOLANA_CONFIG_PRIVATE_DIR"/mint.json + mint_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json $solana_keygen -o "$leader_id_path" - echo "Creating $mint_path with $num_tokens tokens" - $solana_keygen -o "$mint_path" + echo "Creating $mint_id_path with $num_tokens tokens" + $solana_keygen -o "$mint_id_path" echo "Creating $SOLANA_CONFIG_DIR/leader.json" $solana_fullnode_config \ @@ -98,7 +98,7 @@ if $node_type_leader; then echo "Creating $SOLANA_CONFIG_DIR/ledger" $solana_genesis \ --num_tokens "$num_tokens" \ - --mint "$mint_path" \ + --mint "$mint_id_path" \ --bootstrap_leader "$SOLANA_CONFIG_DIR"/leader.json \ --ledger "$SOLANA_CONFIG_DIR"/ledger \