From d6c74f438afeb5876323fb267787cb34b59624df Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 26 Jul 2019 08:42:48 -0700
Subject: [PATCH] Delete vestigal --vote-account argument (#5287)

automerge
---
 multinode-demo/fullnode.sh | 1 -
 run.sh                     | 7 -------
 validator/src/main.rs      | 7 -------
 3 files changed, 15 deletions(-)

diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh
index 3e1ba1e10a..91a7729815 100755
--- a/multinode-demo/fullnode.sh
+++ b/multinode-demo/fullnode.sh
@@ -520,7 +520,6 @@ EOF
     vote_pubkey=$($solana_keygen pubkey "$vote_keypair_path")
     stake_pubkey=$($solana_keygen pubkey "$stake_keypair_path")
     storage_pubkey=$($solana_keygen pubkey "$storage_keypair_path")
-    replace_arg --vote-account "$vote_pubkey"
 
     if [[ $node_type = validator ]] && ((stake_lamports)); then
       setup_validator_accounts "${entrypoint_address%:*}" \
diff --git a/run.sh b/run.sh
index 3050d6ac79..9f990bf90e 100755
--- a/run.sh
+++ b/run.sh
@@ -62,12 +62,6 @@ fi
 solana-keygen new -f -o "$dataDir"/drone-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 \
   --lamports 1000000000 \
   --bootstrap-leader-lamports 10000000 \
@@ -94,7 +88,6 @@ args=(
   --identity "$dataDir"/leader-keypair.json
   --storage-keypair "$dataDir"/leader-storage-account-keypair.json
   --voting-keypair "$dataDir"/leader-vote-account-keypair.json
-  --vote-account "$leaderVoteAccountPubkey"
   --ledger "$ledgerDir"
   --gossip-port 8001
   --rpc-port 8899
diff --git a/validator/src/main.rs b/validator/src/main.rs
index 0fee3afca1..435a80e5a7 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -46,13 +46,6 @@ fn main() {
                 .takes_value(true)
                 .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::with_name("voting_keypair")
                 .long("voting-keypair")