Merge native programs parts into one unit (#7047)

core/Cargo.toml

@@ -57,10 +57,10 @@ solana-net-utils = { path = "../net-utils", version = "0.21.0" }
 solana-perf = { path = "../perf", version = "0.21.0" }
 solana-runtime = { path = "../runtime", version = "0.21.0" }
 solana-sdk = { path = "../sdk", version = "0.21.0" }
-solana-stake-api = { path = "../programs/stake_api", version = "0.21.0" }
+solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
 solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
 solana-storage-program = { path = "../programs/storage_program", version = "0.21.0" }
-solana-vote-api = { path = "../programs/vote_api", version = "0.21.0" }
+solana-vote-program = { path = "../programs/vote", version = "0.21.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.21.0" }
 symlink = "0.1.0"
 sys-info = "0.5.8"

core/src/cluster_info_vote_listener.rs

@@ -86,8 +86,8 @@ mod tests {
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
-    use solana_vote_api::vote_instruction;
-    use solana_vote_api::vote_state::Vote;
+    use solana_vote_program::vote_instruction;
+    use solana_vote_program::vote_state::Vote;
 
     #[test]
     fn test_max_vote_tx_fits() {

core/src/commitment.rs

@@ -1,7 +1,7 @@
 use crate::result::{Error, Result};
 use solana_runtime::bank::Bank;
 use solana_sdk::clock::Slot;
-use solana_vote_api::{vote_state::VoteState, vote_state::MAX_LOCKOUT_HISTORY};
+use solana_vote_program::{vote_state::VoteState, vote_state::MAX_LOCKOUT_HISTORY};
 use std::{
     collections::HashMap,
     sync::atomic::{AtomicBool, Ordering},
@@ -238,8 +238,8 @@ mod tests {
     use super::*;
     use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::pubkey::Pubkey;
-    use solana_stake_api::stake_state;
-    use solana_vote_api::vote_state;
+    use solana_stake_program::stake_state;
+    use solana_vote_program::vote_state;
 
     #[test]
     fn test_block_commitment() {

core/src/consensus.rs

@@ -2,7 +2,7 @@ use solana_ledger::bank_forks::BankForks;
 use solana_metrics::datapoint_debug;
 use solana_runtime::bank::Bank;
 use solana_sdk::{account::Account, clock::Slot, hash::Hash, pubkey::Pubkey};
-use solana_vote_api::vote_state::{Lockout, Vote, VoteState, MAX_LOCKOUT_HISTORY};
+use solana_vote_program::vote_state::{Lockout, Vote, VoteState, MAX_LOCKOUT_HISTORY};
 use std::{
     collections::{HashMap, HashSet},
     sync::Arc,

core/src/replay_stage.rs

@@ -28,7 +28,7 @@ use solana_sdk::{
     timing::{self, duration_as_ms},
     transaction::Transaction,
 };
-use solana_vote_api::vote_instruction;
+use solana_vote_program::vote_instruction;
 use std::{
     collections::HashMap,
     collections::HashSet,
@@ -1081,7 +1081,7 @@ mod test {
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::system_transaction;
     use solana_sdk::transaction::TransactionError;
-    use solana_vote_api::vote_state::VoteState;
+    use solana_vote_program::vote_state::VoteState;
     use std::fs::remove_dir_all;
     use std::iter::FromIterator;
     use std::sync::{Arc, RwLock};

core/src/rpc.rs

@@ -30,7 +30,7 @@ use solana_sdk::{
     signature::Signature,
     transaction::{self, Transaction},
 };
-use solana_vote_api::vote_state::{VoteState, MAX_LOCKOUT_HISTORY};
+use solana_vote_program::vote_state::{VoteState, MAX_LOCKOUT_HISTORY};
 use std::{
     net::{SocketAddr, UdpSocket},
     sync::{Arc, RwLock},

core/src/rpc_subscriptions.rs

@@ -9,7 +9,7 @@ use solana_runtime::bank::Bank;
 use solana_sdk::{
     account::Account, clock::Slot, pubkey::Pubkey, signature::Signature, transaction,
 };
-use solana_vote_api::vote_state::MAX_LOCKOUT_HISTORY;
+use solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY;
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};