Use consistent naming for the mint id file

This commit is contained in:
Michael Vines 2018-12-06 13:48:59 -08:00
parent c4b8f0cd2f
commit 8f0a1e32d5
2 changed files with 7 additions and 7 deletions

View File

@ -19,8 +19,8 @@ usage() {
exit 1 exit 1
} }
[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json ]] || { [[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json ]] || {
echo "$SOLANA_CONFIG_PRIVATE_DIR/mint.json not found, create it by running:" echo "$SOLANA_CONFIG_PRIVATE_DIR/mint-id.json not found, create it by running:"
echo echo
echo " ${here}/setup.sh -t leader" echo " ${here}/setup.sh -t leader"
exit 1 exit 1
@ -30,7 +30,7 @@ set -ex
trap 'kill "$pid" && wait "$pid"' INT TERM trap 'kill "$pid" && wait "$pid"' INT TERM
$solana_drone \ $solana_drone \
--keypair "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json \ --keypair "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json \
> >($drone_logger) 2>&1 & > >($drone_logger) 2>&1 &
pid=$! pid=$!
wait "$pid" wait "$pid"

View File

@ -83,12 +83,12 @@ done
if $node_type_leader; then if $node_type_leader; then
leader_address_args=("$ip_address_arg") leader_address_args=("$ip_address_arg")
leader_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/leader-id.json 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" $solana_keygen -o "$leader_id_path"
echo "Creating $mint_path with $num_tokens tokens" echo "Creating $mint_id_path with $num_tokens tokens"
$solana_keygen -o "$mint_path" $solana_keygen -o "$mint_id_path"
echo "Creating $SOLANA_CONFIG_DIR/leader.json" echo "Creating $SOLANA_CONFIG_DIR/leader.json"
$solana_fullnode_config \ $solana_fullnode_config \
@ -98,7 +98,7 @@ if $node_type_leader; then
echo "Creating $SOLANA_CONFIG_DIR/ledger" echo "Creating $SOLANA_CONFIG_DIR/ledger"
$solana_genesis \ $solana_genesis \
--num_tokens "$num_tokens" \ --num_tokens "$num_tokens" \
--mint "$mint_path" \ --mint "$mint_id_path" \
--bootstrap_leader "$SOLANA_CONFIG_DIR"/leader.json \ --bootstrap_leader "$SOLANA_CONFIG_DIR"/leader.json \
--ledger "$SOLANA_CONFIG_DIR"/ledger \ --ledger "$SOLANA_CONFIG_DIR"/ledger \