Move Vote program out of the SDK

core/src/entry.rs

@@ -13,8 +13,8 @@ use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
-use solana_sdk::vote_program::Vote;
-use solana_sdk::vote_transaction::VoteTransaction;
+use solana_vote_api::vote_instruction::Vote;
+use solana_vote_api::vote_transaction::VoteTransaction;
 use std::borrow::Borrow;
 use std::io::Cursor;
 use std::mem::size_of;

core/src/fullnode.rs

@@ -25,7 +25,7 @@ use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::timing::timestamp;
-use solana_sdk::vote_transaction::VoteTransaction;
+use solana_vote_api::vote_transaction::VoteTransaction;
 use std::net::UdpSocket;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::atomic::{AtomicBool, Ordering};

core/src/leader_confirmation_service.rs

@@ -6,7 +6,7 @@ use crate::service::Service;
 use solana_metrics::{influxdb, submit};
 use solana_runtime::bank::Bank;
 use solana_sdk::timing;
-use solana_sdk::vote_program::VoteState;
+use solana_vote_api::vote_state::VoteState;
 use std::result;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
@@ -127,7 +127,7 @@ mod tests {
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::hash::hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::vote_transaction::VoteTransaction;
+    use solana_vote_api::vote_transaction::VoteTransaction;
     use std::sync::Arc;
 
     #[test]

core/src/local_cluster.rs

@@ -10,8 +10,8 @@ use solana_sdk::genesis_block::GenesisBlock;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_transaction::SystemTransaction;
-use solana_sdk::vote_program::VoteState;
-use solana_sdk::vote_transaction::VoteTransaction;
+use solana_vote_api::vote_state::VoteState;
+use solana_vote_api::vote_transaction::VoteTransaction;
 use std::fs::remove_dir_all;
 use std::io::{Error, ErrorKind, Result};
 use std::sync::atomic::{AtomicBool, Ordering};

core/src/replay_stage.rs

@@ -18,7 +18,7 @@ use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::KeypairUtil;
 use solana_sdk::timing::duration_as_ms;
-use solana_sdk::vote_transaction::VoteTransaction;
+use solana_vote_api::vote_transaction::VoteTransaction;
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::{channel, Receiver, RecvTimeoutError};

core/src/staking_utils.rs

@@ -1,7 +1,7 @@
 use hashbrown::HashMap;
 use solana_runtime::bank::Bank;
 use solana_sdk::pubkey::Pubkey;
-use solana_sdk::vote_program::VoteState;
+use solana_vote_api::vote_state::VoteState;
 
 /// Looks through vote accounts, and finds the latest slot that has achieved
 /// supermajority lockout

core/src/storage_stage.rs

@@ -18,7 +18,6 @@ use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, Signature};
 use solana_sdk::storage_program::{self, StorageProgram, StorageTransaction};
 use solana_sdk::transaction::Transaction;
-use solana_sdk::vote_program;
 use std::collections::HashSet;
 use std::io;
 use std::mem::size_of;
@@ -368,7 +367,7 @@ impl StorageStage {
             // the storage_keys with their signatures.
             for tx in entry.transactions {
                 for (i, program_id) in tx.program_ids.iter().enumerate() {
-                    if vote_program::check_id(&program_id) {
+                    if solana_vote_api::check_id(&program_id) {
                         debug!(
                             "generating storage_keys from votes current_key_idx: {}",
                             *current_key_idx
@@ -459,7 +458,7 @@ mod tests {
     use solana_sdk::hash::Hasher;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::vote_transaction::VoteTransaction;
+    use solana_vote_api::vote_transaction::VoteTransaction;
     use std::cmp::{max, min};
     use std::fs::remove_dir_all;
     use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};

core/src/thin_client.rs

@@ -490,8 +490,8 @@ mod tests {
     use crate::client::mk_client;
     use bincode::{deserialize, serialize};
     use solana_sdk::system_instruction::SystemInstruction;
-    use solana_sdk::vote_program::VoteState;
-    use solana_sdk::vote_transaction::VoteTransaction;
+    use solana_vote_api::vote_state::VoteState;
+    use solana_vote_api::vote_transaction::VoteTransaction;
     use std::fs::remove_dir_all;
 
     #[test]

core/src/voting_keypair.rs

@@ -101,7 +101,7 @@ pub mod tests {
     use solana_runtime::bank::Bank;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::vote_transaction::VoteTransaction;
+    use solana_vote_api::vote_transaction::VoteTransaction;
 
     pub fn new_vote_account(
         from_keypair: &Keypair,