Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove solana-program from solana-vote #4537

Merged
merged 3 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion svm/examples/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vote/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [
solana-hash = { workspace = true }
solana-instruction = { workspace = true }
solana-packet = { workspace = true }
solana-program = { workspace = true }
solana-pubkey = { workspace = true }
solana-sdk-ids = { workspace = true }
solana-signature = { workspace = true }
solana-svm-transaction = { workspace = true }
solana-transaction = { workspace = true }
solana-vote-interface = { workspace = true, features = ["bincode"] }
thiserror = { workspace = true }

[lib]
Expand Down
2 changes: 1 addition & 1 deletion vote/benches/vote_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ extern crate test;
use {
rand::Rng,
solana_account::AccountSharedData,
solana_program::vote::state::{VoteInit, VoteState, VoteStateVersions},
solana_pubkey::Pubkey,
solana_vote::vote_account::VoteAccount,
solana_vote_interface::state::{VoteInit, VoteState, VoteStateVersions},
test::Bencher,
};

Expand Down
6 changes: 3 additions & 3 deletions vote/src/vote_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use {
},
solana_account::{AccountSharedData, ReadableAccount},
solana_instruction::error::InstructionError,
solana_program::vote::state::VoteState,
solana_pubkey::Pubkey,
solana_vote_interface::state::VoteState,
std::{
cmp::Ordering,
collections::{hash_map::Entry, HashMap},
Expand Down Expand Up @@ -97,7 +97,7 @@ impl VoteAccount {
use {
rand::Rng as _,
solana_clock::Clock,
solana_program::vote::state::{VoteInit, VoteStateVersions},
solana_vote_interface::state::{VoteInit, VoteStateVersions},
};

let mut rng = rand::thread_rng();
Expand Down Expand Up @@ -483,8 +483,8 @@ mod tests {
rand::Rng,
solana_account::WritableAccount,
solana_clock::Clock,
solana_program::vote::state::{VoteInit, VoteStateVersions},
solana_pubkey::Pubkey,
solana_vote_interface::state::{VoteInit, VoteStateVersions},
std::iter::repeat_with,
};

Expand Down
8 changes: 4 additions & 4 deletions vote/src/vote_parser.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use {
crate::vote_transaction::VoteTransaction, solana_bincode::limited_deserialize,
solana_hash::Hash, solana_program::vote::instruction::VoteInstruction, solana_pubkey::Pubkey,
solana_signature::Signature, solana_svm_transaction::svm_transaction::SVMTransaction,
solana_transaction::Transaction,
solana_hash::Hash, solana_pubkey::Pubkey, solana_signature::Signature,
solana_svm_transaction::svm_transaction::SVMTransaction, solana_transaction::Transaction,
solana_vote_interface::instruction::VoteInstruction,
};

pub type ParsedVote = (Pubkey, VoteTransaction, Option<Hash>, Signature);
Expand Down Expand Up @@ -82,9 +82,9 @@ mod test {
super::*,
solana_clock::Slot,
solana_keypair::Keypair,
solana_program::vote::{instruction as vote_instruction, state::Vote},
solana_sha256_hasher::hash,
solana_signer::Signer,
solana_vote_interface::{instruction as vote_instruction, state::Vote},
};

// Reimplemented locally from Vote program.
Expand Down
2 changes: 1 addition & 1 deletion vote/src/vote_transaction.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
solana_clock::{Slot, UnixTimestamp},
solana_hash::Hash,
solana_program::vote::state::{TowerSync, Vote, VoteStateUpdate},
solana_vote_interface::state::{TowerSync, Vote, VoteStateUpdate},
};

#[derive(Debug, PartialEq, Eq, Clone)]
Expand Down
Loading