remove solana-vote-program dep from solana-transaction-status (#27845)

Co-authored-by: Kevin Heavey <ID+username@users.noreply.github.com>
This commit is contained in:
Kevin Heavey 2022-09-16 22:46:47 +01:00 committed by GitHub
parent 742ee71138
commit 8c41cf9330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 11 deletions

1
Cargo.lock generated
View File

@ -6592,7 +6592,6 @@ dependencies = [
"solana-measure",
"solana-metrics",
"solana-sdk 1.15.0",
"solana-vote-program",
"spl-associated-token-account",
"spl-memo",
"spl-token",

View File

@ -5828,7 +5828,6 @@ dependencies = [
"solana-measure",
"solana-metrics",
"solana-sdk 1.15.0",
"solana-vote-program",
"spl-associated-token-account",
"spl-memo",
"spl-token",

View File

@ -25,7 +25,6 @@ solana-address-lookup-table-program = { path = "../programs/address-lookup-table
solana-measure = { path = "../measure", version = "=1.15.0" }
solana-metrics = { path = "../metrics", version = "=1.15.0" }
solana-sdk = { path = "../sdk", version = "=1.15.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.15.0" }
spl-associated-token-account = { version = "=1.1.1", features = ["no-entrypoint"] }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }

View File

@ -14,7 +14,7 @@ use {
solana_account_decoder::parse_token::spl_token_ids,
solana_sdk::{
instruction::CompiledInstruction, message::AccountKeys, pubkey::Pubkey, stake,
system_program,
system_program, vote,
},
std::{
collections::HashMap,
@ -32,7 +32,7 @@ lazy_static! {
static ref MEMO_V3_PROGRAM_ID: Pubkey = spl_memo_id_v3();
static ref STAKE_PROGRAM_ID: Pubkey = stake::program::id();
static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
static ref VOTE_PROGRAM_ID: Pubkey = solana_vote_program::id();
static ref VOTE_PROGRAM_ID: Pubkey = vote::program::id();
static ref PARSABLE_PROGRAM_IDS: HashMap<Pubkey, ParsableProgram> = {
let mut m = HashMap::new();
m.insert(

View File

@ -4,8 +4,9 @@ use {
},
bincode::deserialize,
serde_json::json,
solana_sdk::{instruction::CompiledInstruction, message::AccountKeys},
solana_vote_program::vote_instruction::VoteInstruction,
solana_sdk::{
instruction::CompiledInstruction, message::AccountKeys, vote::instruction::VoteInstruction,
},
};
pub fn parse_vote(
@ -247,10 +248,15 @@ fn check_num_vote_accounts(accounts: &[u8], num: usize) -> Result<(), ParseInstr
mod test {
use {
super::*,
solana_sdk::{hash::Hash, message::Message, pubkey::Pubkey, sysvar},
solana_vote_program::{
vote_instruction,
vote_state::{Vote, VoteAuthorize, VoteInit, VoteStateUpdate},
solana_sdk::{
hash::Hash,
message::Message,
pubkey::Pubkey,
sysvar,
vote::{
instruction as vote_instruction,
state::{Vote, VoteAuthorize, VoteInit, VoteStateUpdate},
},
},
};