diff --git a/Cargo.lock b/Cargo.lock index 0f41d03e..8fb70bac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6757,7 +6757,7 @@ dependencies = [ "solana-sysvar 3.0.0", "solana-sysvar-id", "solana-transaction", - "solana-vote-interface 4.0.4", + "solana-vote-interface 5.0.0", "test-case", ] @@ -7344,9 +7344,9 @@ dependencies = [ [[package]] name = "solana-vote-interface" -version = "4.0.4" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6e123e16bfdd7a81d71b4c4699e0b29580b619f4cd2ef5b6aae1eb85e8979f" +checksum = "f7b4fb47dbad5a777e08ac4b1259e1fc5839c2e250512902a6d3b814f5c6040f" dependencies = [ "bincode", "cfg_eval", @@ -7356,16 +7356,16 @@ dependencies = [ "serde_derive", "serde_with", "solana-clock", - "solana-hash 3.1.0", + "solana-hash 4.2.0", "solana-instruction", "solana-instruction-error", - "solana-pubkey 3.0.0", + "solana-pubkey 4.1.0", "solana-rent 3.0.0", "solana-sdk-ids", "solana-serde-varint", "solana-serialize-utils", "solana-short-vec", - "solana-system-interface 2.0.0", + "solana-system-interface 3.0.0", ] [[package]] diff --git a/program/Cargo.toml b/program/Cargo.toml index b110dc4e..f7fb1230 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -22,7 +22,7 @@ solana-rent = "3.0.0" solana-stake-interface = { version = "2", features = ["bincode", "borsh", "sysvar"] } solana-sysvar = "3.0.0" solana-sysvar-id = "3.1.0" -solana-vote-interface = { version = "4.0.4", features = ["bincode"] } +solana-vote-interface = { version = "5.0.0", features = ["bincode"] } [dev-dependencies] agave-feature-set = "3.0.0" diff --git a/program/tests/stake_instruction.rs b/program/tests/stake_instruction.rs index e8f2b5c1..2e11ed83 100644 --- a/program/tests/stake_instruction.rs +++ b/program/tests/stake_instruction.rs @@ -7052,7 +7052,6 @@ fn test_stake_process_instruction_with_epoch_rewards_active() { #[derive(Debug, Clone, Copy)] enum VoteStateVersion { - V0_23_5, V1_14_11, V3, V4, @@ -7061,7 +7060,6 @@ enum VoteStateVersion { impl VoteStateVersion { fn default_vote_state(&self) -> VoteStateVersions { match self { - Self::V0_23_5 => VoteStateVersions::V0_23_5(Box::default()), Self::V1_14_11 => VoteStateVersions::V1_14_11(Box::default()), Self::V3 => VoteStateVersions::V3(Box::default()), Self::V4 => VoteStateVersions::V4(Box::default()), @@ -7245,14 +7243,10 @@ fn test_delegate_incorrect_vote_owner() { // Just like with `VoteStateV3`, we know V0_23_5 vote state will fail to // deserialize with `InvalidAccountData`. In other words, the behavior is // unchanged. -#[test_case(VoteStateVersion::V0_23_5, Err(ProgramError::InvalidAccountData))] -#[test_case(VoteStateVersion::V1_14_11, Ok(()))] -#[test_case(VoteStateVersion::V3, Ok(()))] -#[test_case(VoteStateVersion::V4, Ok(()))] -fn test_delegate_deserialize_vote_state( - vote_state_version: VoteStateVersion, - expected_result: Result<(), ProgramError>, -) { +#[test_case(VoteStateVersion::V1_14_11)] +#[test_case(VoteStateVersion::V3)] +#[test_case(VoteStateVersion::V4)] +fn test_delegate_deserialize_vote_state(vote_state_version: VoteStateVersion) { let vote_state = vote_state_version.default_vote_state(); let vote_account = AccountSharedData::new_data_with_space( Rent::default().minimum_balance(VoteStateV4::size_of()), @@ -7270,7 +7264,7 @@ fn test_delegate_deserialize_vote_state( &serialize(&StakeInstruction::DelegateStake).unwrap(), transaction_accounts, instruction_accounts, - expected_result, + Ok(()), ); } @@ -7299,16 +7293,10 @@ fn test_deactivate_delinquent_incorrect_vote_owner() { ); } -// Again, just like with `VoteStateV3`, we know V0_23_5 vote state will fail to -// deserialize with `InvalidAccountData`. Again, the behavior is unchanged. -#[test_case(VoteStateVersion::V0_23_5, Err(ProgramError::InvalidAccountData))] -#[test_case(VoteStateVersion::V1_14_11, Ok(()))] -#[test_case(VoteStateVersion::V3, Ok(()))] -#[test_case(VoteStateVersion::V4, Ok(()))] -fn test_deactivate_delinquent_deserialize_vote_state( - vote_state_version: VoteStateVersion, - expected_result: Result<(), ProgramError>, -) { +#[test_case(VoteStateVersion::V1_14_11)] +#[test_case(VoteStateVersion::V3)] +#[test_case(VoteStateVersion::V4)] +fn test_deactivate_delinquent_deserialize_vote_state(vote_state_version: VoteStateVersion) { // Create delinquent vote account with the specified version let vote_state = vote_state_version.default_vote_state(); let vote_account = AccountSharedData::new_data_with_space( @@ -7327,6 +7315,6 @@ fn test_deactivate_delinquent_deserialize_vote_state( &serialize(&StakeInstruction::DeactivateDelinquent).unwrap(), transaction_accounts, instruction_accounts, - expected_result, + Ok(()), ); }