Delete vestigal --vote-account argument (#5287)

automerge
This commit is contained in:
Michael Vines 2019-07-26 08:42:48 -07:00 committed by Grimes
parent 349ebec629
commit d6c74f438a
3 changed files with 0 additions and 15 deletions

View File

@ -520,7 +520,6 @@ EOF
vote_pubkey=$($solana_keygen pubkey "$vote_keypair_path") vote_pubkey=$($solana_keygen pubkey "$vote_keypair_path")
stake_pubkey=$($solana_keygen pubkey "$stake_keypair_path") stake_pubkey=$($solana_keygen pubkey "$stake_keypair_path")
storage_pubkey=$($solana_keygen pubkey "$storage_keypair_path") storage_pubkey=$($solana_keygen pubkey "$storage_keypair_path")
replace_arg --vote-account "$vote_pubkey"
if [[ $node_type = validator ]] && ((stake_lamports)); then if [[ $node_type = validator ]] && ((stake_lamports)); then
setup_validator_accounts "${entrypoint_address%:*}" \ setup_validator_accounts "${entrypoint_address%:*}" \

7
run.sh
View File

@ -62,12 +62,6 @@ fi
solana-keygen new -f -o "$dataDir"/drone-keypair.json solana-keygen new -f -o "$dataDir"/drone-keypair.json
solana-keygen new -f -o "$dataDir"/leader-storage-account-keypair.json solana-keygen new -f -o "$dataDir"/leader-storage-account-keypair.json
leaderVoteAccountPubkey=$(\
solana-wallet \
--keypair "$dataDir"/leader-vote-account-keypair.json \
address \
)
solana-genesis \ solana-genesis \
--lamports 1000000000 \ --lamports 1000000000 \
--bootstrap-leader-lamports 10000000 \ --bootstrap-leader-lamports 10000000 \
@ -94,7 +88,6 @@ args=(
--identity "$dataDir"/leader-keypair.json --identity "$dataDir"/leader-keypair.json
--storage-keypair "$dataDir"/leader-storage-account-keypair.json --storage-keypair "$dataDir"/leader-storage-account-keypair.json
--voting-keypair "$dataDir"/leader-vote-account-keypair.json --voting-keypair "$dataDir"/leader-vote-account-keypair.json
--vote-account "$leaderVoteAccountPubkey"
--ledger "$ledgerDir" --ledger "$ledgerDir"
--gossip-port 8001 --gossip-port 8001
--rpc-port 8899 --rpc-port 8899

View File

@ -46,13 +46,6 @@ fn main() {
.takes_value(true) .takes_value(true)
.help("File containing an identity (keypair)"), .help("File containing an identity (keypair)"),
) )
.arg(
Arg::with_name("vote_account")
.long("vote-account")
.value_name("PUBKEY_BASE58_STR")
.takes_value(true)
.help("Public key of the vote account, where to send votes"),
)
.arg( .arg(
Arg::with_name("voting_keypair") Arg::with_name("voting_keypair")
.long("voting-keypair") .long("voting-keypair")