refactor: remove unused alpenglow-vote items (anza-xyz#315)

Author: ksn6

perf/src/sigverify.rs

@@ -637,7 +637,7 @@ mod tests {
         crate::{
             packet::{to_packet_batches, Packet, PacketBatch, PACKETS_PER_BATCH},
             sigverify::{self, PacketOffsets},
-            test_tx::{new_test_alpenglow_vote_tx, new_test_vote_tx, test_multisig_tx, test_tx},
+            test_tx::{new_test_vote_tx, test_multisig_tx, test_tx},
         },
         bincode::{deserialize, serialize},
         curve25519_dalek::{edwards::CompressedEdwardsY, scalar::Scalar},
@@ -651,7 +651,6 @@ mod tests {
             iter::repeat_with,
             sync::atomic::{AtomicU64, Ordering},
         },
-        test_case::test_case,
     };
 
     const SIG_OFFSET: usize = 1;
@@ -1377,9 +1376,8 @@ mod tests {
         }
     }
 
-    #[test_case(true; "alpenglow")]
-    #[test_case(false; "towerbft")]
-    fn test_is_simple_vote_transaction_with_offsets(is_alpenglow: bool) {
+    #[test]
+    fn test_is_simple_vote_transaction_with_offsets() {
         solana_logger::setup();
         let mut rng = rand::thread_rng();
 
@@ -1388,11 +1386,7 @@ mod tests {
             let mut current_offset = 0usize;
             let mut batch = PacketBatch::default();
             batch.push(Packet::from_data(None, test_tx()).unwrap());
-            let tx = if is_alpenglow {
-                new_test_alpenglow_vote_tx(&mut rng)
-            } else {
-                new_test_vote_tx(&mut rng)
-            };
+            let tx = new_test_vote_tx(&mut rng);
             batch.push(Packet::from_data(None, tx).unwrap());
             batch.iter_mut().enumerate().for_each(|(index, packet)| {
                 let packet_offsets = do_get_packet_offsets(packet, current_offset).unwrap();

perf/src/test_tx.rs

@@ -8,7 +8,7 @@ use {
     solana_signer::Signer,
     solana_system_interface::instruction::SystemInstruction,
     solana_transaction::Transaction,
-    solana_vote::{alpenglow::vote::Vote as AlpenglowVote, vote_transaction},
+    solana_vote::vote_transaction,
     solana_vote_program::vote_state::TowerSync,
 };
 
@@ -69,15 +69,3 @@ where
         switch_proof_hash,
     )
 }
-
-pub fn new_test_alpenglow_vote_tx<R>(rng: &mut R) -> Transaction
-where
-    R: CryptoRng + RngCore,
-{
-    let slot = rng.gen();
-    let vote = AlpenglowVote::new_notarization_vote(slot, Hash::new_unique(), Hash::new_unique());
-    let keypair = Keypair::new();
-    let vote_ix = vote.to_vote_instruction(keypair.pubkey(), keypair.pubkey());
-
-    Transaction::new_with_payer(&[vote_ix], Some(&keypair.pubkey()))
-}

runtime/src/inflation_rewards/mod.rs

@@ -255,14 +255,10 @@ fn commission_split(commission: u8, on: u64) -> (u64, u64, bool) {
 #[cfg(test)]
 mod tests {
     use {
-        self::points::null_tracer,
-        super::*,
-        solana_program::stake::state::Delegation,
-        solana_pubkey::Pubkey,
-        solana_sdk::native_token::sol_to_lamports,
-        solana_vote::alpenglow::{accounting::EpochCredit, state::VoteState as AlpenglowVoteState},
-        solana_vote_program::vote_state::VoteState,
-        test_case::test_case,
+        self::points::null_tracer, super::*, solana_program::stake::state::Delegation,
+        solana_pubkey::Pubkey, solana_sdk::native_token::sol_to_lamports,
+        solana_vote::alpenglow::state::VoteState as AlpenglowVoteState,
+        solana_vote_program::vote_state::VoteState, test_case::test_case,
     };
 
     fn new_stake(
@@ -277,21 +273,15 @@ mod tests {
         }
     }
 
-    #[test_case(true; "alpenglow")]
-    #[test_case(false; "towerbft")]
-    fn test_stake_state_redeem_rewards(is_alpenglow: bool) {
+    #[test]
+    fn test_stake_state_redeem_rewards() {
         let mut vote_state = VoteState::default();
-        let mut alpenglow_vote_state = AlpenglowVoteState::default();
         // assume stake.stake() is right
         // bootstrap means fully-vested stake at epoch 0
         let stake_lamports = 1;
         let mut stake = new_stake(stake_lamports, &Pubkey::default(), 0, u64::MAX);
 
-        let vote_account = if is_alpenglow {
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
-            VoteAccount::new_from_vote_state(&vote_state)
-        };
+        let vote_account = { VoteAccount::new_from_vote_state(&vote_state) };
         // this one can't collect now, credits_observed == vote_state.credits()
         assert_eq!(
             None,
@@ -310,10 +300,7 @@ mod tests {
         );
 
         // put 2 credits in at epoch 0
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_epoch_credits(EpochCredit::new(0, 2, 0));
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.increment_credits(0, 1);
             vote_state.increment_credits(0, 1);
             VoteAccount::new_from_vote_state(&vote_state)
@@ -343,21 +330,15 @@ mod tests {
         assert_eq!(stake.credits_observed, 2);
     }
 
-    //TODO(wen): the alpenglow test cases don't work yet because we only keep credits for one Epoch
-    #[test_case(false; "towerbft")]
-    fn test_stake_state_calculate_rewards(is_alpenglow: bool) {
+    #[test]
+    fn test_stake_state_calculate_rewards() {
         let mut vote_state = VoteState::default();
-        let mut alpenglow_vote_state = AlpenglowVoteState::default();
 
         // assume stake.stake() is right
         // bootstrap means fully-vested stake at epoch 0
         let mut stake = new_stake(1, &Pubkey::default(), 0, u64::MAX);
 
-        let vote_account = if is_alpenglow {
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
-            VoteAccount::new_from_vote_state(&vote_state)
-        };
+        let vote_account = VoteAccount::new_from_vote_state(&vote_state);
 
         // this one can't collect now, credits_observed == vote_state.credits()
         assert_eq!(
@@ -377,10 +358,7 @@ mod tests {
         );
 
         // put 2 credits in at epoch 0
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_epoch_credits(EpochCredit::new(0, 2, 0));
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.increment_credits(0, 1);
             vote_state.increment_credits(0, 1);
             VoteAccount::new_from_vote_state(&vote_state)
@@ -430,10 +408,7 @@ mod tests {
         );
 
         // put 1 credit in epoch 1
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_epoch_credits(EpochCredit::new(1, 1, 2));
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.increment_credits(1, 1);
             VoteAccount::new_from_vote_state(&vote_state)
         };
@@ -461,10 +436,7 @@ mod tests {
         );
 
         // put 1 credit in epoch 2
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_epoch_credits(EpochCredit::new(2, 1, 1));
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.increment_credits(2, 1);
             VoteAccount::new_from_vote_state(&vote_state)
         };
@@ -516,10 +488,7 @@ mod tests {
 
         // same as above, but is a really small commission out of 32 bits,
         //  verify that None comes back on small redemptions where no one gets paid
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_commission(1);
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.commission = 1;
             VoteAccount::new_from_vote_state(&vote_state)
         };
@@ -538,10 +507,7 @@ mod tests {
                 None,
             )
         );
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_commission(99);
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.commission = 99;
             VoteAccount::new_from_vote_state(&vote_state)
         };
@@ -658,10 +624,7 @@ mod tests {
         );
 
         // get rewards and credits observed when not the activation epoch
-        let vote_account = if is_alpenglow {
-            alpenglow_vote_state.set_commission(0);
-            VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state)
-        } else {
+        let vote_account = {
             vote_state.commission = 0;
             VoteAccount::new_from_vote_state(&vote_state)
         };

runtime/src/inflation_rewards/points.rs

@@ -206,9 +206,7 @@ pub(crate) fn calculate_stake_points_and_credits(
 #[cfg(test)]
 mod tests {
     use {
-        super::*,
-        solana_sdk::native_token::sol_to_lamports,
-        solana_vote::alpenglow::{accounting::EpochCredit, state::VoteState as AlpenglowVoteState},
+        super::*, solana_sdk::native_token::sol_to_lamports,
         solana_vote_program::vote_state::VoteState,
     };
 
@@ -227,7 +225,6 @@ mod tests {
     #[test]
     fn test_stake_state_calculate_points_with_typical_values() {
         let mut vote_state = VoteState::default();
-        let mut alpenglow_vote_state = AlpenglowVoteState::default();
 
         // bootstrap means fully-vested stake at epoch 0 with
         //  10_000_000 SOL is a big but not unreasonable stake
@@ -244,8 +241,6 @@ mod tests {
         for _ in 0..epoch_slots {
             vote_state.increment_credits(0, 1);
         }
-        // We give one credit for notarization and one for finalization, so we have 2 credits each slot.
-        alpenglow_vote_state.set_epoch_credits(EpochCredit::new(0, vote_state.credits() * 2, 0));
 
         // no overflow on points
         assert_eq!(
@@ -258,15 +253,5 @@ mod tests {
                 None
             )
         );
-        assert_eq!(
-            u128::from(stake.delegation.stake) * epoch_slots * 2,
-            calculate_stake_points(
-                &stake,
-                &VoteAccount::new_from_alpenglow_vote_state(&alpenglow_vote_state),
-                &StakeHistory::default(),
-                null_tracer(),
-                None
-            )
-        );
     }
 }