feat: add some missing tests that were already planned via // TODO (#470)

* feat: add TODO validator removal tests

* feat: add 2 missing add validator tests

* feat: update validator_list helper

* style: rm mut fmt inconsistency

* fix: rustfmt + clippy program

Author: juliaaschmidt

program/tests/helpers/mod.rs

@@ -2668,6 +2668,33 @@ pub async fn setup_for_withdraw(
     )
 }
 
+pub async fn set_validator_list_to_uninitialized_account(
+    context: &mut ProgramTestContext,
+    stake_pool_accounts: &StakePoolAccounts,
+) {
+    // Get the rent-exempt minimum for the account size
+    let rent = context.banks_client.get_rent().await.unwrap();
+    let account_size = std::mem::size_of::<state::ValidatorList>();
+    let minimum_balance = rent.minimum_balance(account_size);
+
+    // Create an uninitialized account at the SAME validator list address
+    // This simulates the validator list account being corrupted/uninitialized
+    // while keeping the same pubkey that the stake pool expects
+    let uninitialized_account = solana_sdk::account::Account {
+        lamports: minimum_balance,
+        data: vec![0u8; account_size], // All zeros - truly uninitialized
+        owner: id(),                   // Owned by stake pool program
+        executable: false,
+        rent_epoch: 0,
+    };
+
+    // Set the uninitialized account at the original validator list address
+    context.set_account(
+        &stake_pool_accounts.validator_list.pubkey(),
+        &uninitialized_account.into(),
+    );
+}
+
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum DecreaseInstruction {
     Additional,

program/tests/vsa_add.rs

@@ -72,6 +72,46 @@ async fn setup(
     )
 }
 
+// Setup function that returns ProgramTestContext for tests that need epoch warping
+async fn setup_with_context(
+    num_validators: u64,
+) -> (ProgramTestContext, StakePoolAccounts, ValidatorStakeAccount) {
+    let mut context = program_test().start_with_context().await;
+    let rent = context.banks_client.get_rent().await.unwrap();
+    let stake_rent = rent.minimum_balance(std::mem::size_of::<stake::state::StakeStateV2>());
+    let current_minimum_delegation = stake_pool_get_minimum_delegation(
+        &mut context.banks_client,
+        &context.payer,
+        &context.last_blockhash,
+    )
+    .await;
+    let minimum_for_validator = stake_rent + current_minimum_delegation;
+
+    let stake_pool_accounts = StakePoolAccounts::default();
+    stake_pool_accounts
+        .initialize_stake_pool(
+            &mut context.banks_client,
+            &context.payer,
+            &context.last_blockhash,
+            MINIMUM_RESERVE_LAMPORTS + num_validators * minimum_for_validator,
+        )
+        .await
+        .unwrap();
+
+    let validator_stake =
+        ValidatorStakeAccount::new(&stake_pool_accounts.stake_pool.pubkey(), None, 0);
+    create_vote(
+        &mut context.banks_client,
+        &context.payer,
+        &context.last_blockhash,
+        &validator_stake.validator,
+        &validator_stake.vote,
+    )
+    .await;
+
+    (context, stake_pool_accounts, validator_stake)
+}
+
 #[tokio::test]
 async fn success() {
     let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, validator_stake) =
@@ -501,10 +541,66 @@ async fn fail_add_too_many_validator_stake_accounts() {
 }
 
 #[tokio::test]
-async fn fail_with_unupdated_stake_pool() {} // TODO
+async fn fail_with_not_updated_stake_pool() {
+    let (mut context, stake_pool_accounts, validator_stake) = setup_with_context(1).await;
+
+    // Move to next epoch
+    let first_normal_slot = context.genesis_config().epoch_schedule.first_normal_slot;
+    let slots_per_epoch = context.genesis_config().epoch_schedule.slots_per_epoch;
+    let slot = first_normal_slot + slots_per_epoch + 1;
+    context.warp_to_slot(slot).unwrap();
+
+    // Do not update stake pool
+
+    let transaction_error = stake_pool_accounts
+        .add_validator_to_pool(
+            &mut context.banks_client,
+            &context.payer,
+            &context.last_blockhash,
+            &validator_stake.stake_account,
+            &validator_stake.vote.pubkey(),
+            validator_stake.validator_stake_seed,
+        )
+        .await;
+    let transaction_error = transaction_error.unwrap();
+    let program_error = StakePoolError::StakeListAndPoolOutOfDate as u32;
+    match transaction_error {
+        TransportError::TransactionError(TransactionError::InstructionError(_, error)) => {
+            assert_eq!(error, InstructionError::Custom(program_error));
+        }
+        _ => panic!("Wrong error occurs while trying to add validator to outdated stake pool"),
+    }
+}
 
 #[tokio::test]
-async fn fail_with_uninitialized_validator_list_account() {} // TODO
+async fn fail_with_uninitialized_validator_list_account() {
+    let (mut context, stake_pool_accounts, validator_stake) = setup_with_context(1).await;
+
+    // Set the validator list to an uninitialized account
+    set_validator_list_to_uninitialized_account(&mut context, &stake_pool_accounts).await;
+
+    // Attempt to add validator to pool with uninitialized validator list
+    let transaction_error = stake_pool_accounts
+        .add_validator_to_pool(
+            &mut context.banks_client,
+            &context.payer,
+            &context.last_blockhash,
+            &validator_stake.stake_account,
+            &validator_stake.vote.pubkey(),
+            validator_stake.validator_stake_seed,
+        )
+        .await;
+    let transaction_error = transaction_error.unwrap();
+    let program_error = StakePoolError::InvalidState as u32;
+    match transaction_error {
+        TransportError::TransactionError(TransactionError::InstructionError(_, error)) => {
+            assert_eq!(error, InstructionError::Custom(program_error));
+        }
+        _ => panic!(
+            "Wrong error occurs while trying to add validator with uninitialized validator list"
+        ),
+    }
+}
 
 #[tokio::test]
 async fn fail_on_non_vote_account() {

program/tests/vsa_remove.rs

@@ -3,7 +3,7 @@ mod helpers;
 
 use {
     bincode::deserialize,
-    helpers::*,
+    helpers::{set_validator_list_to_uninitialized_account, *},
     solana_program::{
         borsh1::try_from_slice_unchecked,
         instruction::{AccountMeta, Instruction, InstructionError},
@@ -843,10 +843,65 @@ async fn success_with_hijacked_transient_account() {
 }
 
 #[tokio::test]
-async fn fail_not_updated_stake_pool() {} // TODO
+async fn fail_not_updated_stake_pool() {
+    let (mut context, stake_pool_accounts, validator_stake) = setup().await;
+
+    // move to next epoch
+    let first_normal_slot = context.genesis_config().epoch_schedule.first_normal_slot;
+    let slots_per_epoch = context.genesis_config().epoch_schedule.slots_per_epoch;
+    let slot = first_normal_slot + slots_per_epoch + 1;
+    context.warp_to_slot(slot).unwrap();
+
+    // do not update stake pool
+
+    let transaction_error = stake_pool_accounts
+        .remove_validator_from_pool(
+            &mut context.banks_client,
+            &context.payer,
+            &context.last_blockhash,
+            &validator_stake.stake_account,
+            &validator_stake.transient_stake_account,
+        )
+        .await;
+    let transaction_error = transaction_error.unwrap();
+    match transaction_error {
+        TransportError::TransactionError(TransactionError::InstructionError(_, error)) => {
+            let program_error = StakePoolError::StakeListAndPoolOutOfDate as u32;
+            assert_eq!(error, InstructionError::Custom(program_error));
+        }
+        _ => panic!("Wrong error occurs while trying to remove validator from outdated stake pool"),
+    }
+}
 
 #[tokio::test]
-async fn fail_with_uninitialized_validator_list_account() {} // TODO
+async fn fail_with_uninitialized_validator_list_account() {
+    let (mut context, stake_pool_accounts, validator_stake) = setup().await;
+
+    // Set the validator list to an uninitialized account
+    set_validator_list_to_uninitialized_account(&mut context, &stake_pool_accounts).await;
+
+    // Attempt to remove validator from pool with uninitialized validator list
+    let transaction_error = stake_pool_accounts
+        .remove_validator_from_pool(
+            &mut context.banks_client,
+            &context.payer,
+            &context.last_blockhash,
+            &validator_stake.stake_account,
+            &validator_stake.transient_stake_account,
+        )
+        .await;
+
+    let transaction_error = transaction_error.unwrap();
+    let program_error = StakePoolError::InvalidState as u32;
+    match transaction_error {
+        TransportError::TransactionError(TransactionError::InstructionError(_, error)) => {
+            assert_eq!(error, InstructionError::Custom(program_error));
+        }
+        _ => panic!(
+            "Wrong error occurs while trying to remove validator with uninitialized validator list"
+        ),
+    }
+}
 
 #[tokio::test]
 async fn update_no_merge_after_removal() {