Move AlpenglowVoteSender and rename ingest_gossip_alpenglow_votes (anza-xyz#106)

Author: wen-coding

core/src/cluster_info_vote_listener.rs

@@ -30,7 +30,7 @@ use {
         commitment::VOTE_THRESHOLD_SIZE,
         epoch_stakes::EpochStakes,
         root_bank_cache::RootBankCache,
-        vote_sender_types::ReplayVoteReceiver,
+        vote_sender_types::{AlpenglowVoteSender, ReplayVoteReceiver},
     },
     solana_sdk::{
         clock::{Slot, DEFAULT_MS_PER_SLOT},
@@ -67,8 +67,6 @@ pub type GossipVerifiedVoteHashSender = Sender<(Pubkey, Slot, Hash)>;
 pub type GossipVerifiedVoteHashReceiver = Receiver<(Pubkey, Slot, Hash)>;
 pub type DuplicateConfirmedSlotsSender = Sender<ThresholdConfirmedSlots>;
 pub type DuplicateConfirmedSlotsReceiver = Receiver<ThresholdConfirmedSlots>;
-pub type AlpenglowVoteSender = Sender<(AlpenglowVote, Pubkey, Transaction)>;
-pub type AlpenglowVoteReceiver = Receiver<(AlpenglowVote, Pubkey, Transaction)>;
 
 const THRESHOLDS_TO_CHECK: [f64; 2] = [DUPLICATE_THRESHOLD, VOTE_THRESHOLD_SIZE];
 

core/src/replay_stage.rs

@@ -14,8 +14,7 @@ use {
         },
         banking_trace::BankingTracer,
         cluster_info_vote_listener::{
-            AlpenglowVoteReceiver, DuplicateConfirmedSlotsReceiver, GossipVerifiedVoteHashReceiver,
-            VoteTracker,
+            DuplicateConfirmedSlotsReceiver, GossipVerifiedVoteHashReceiver, VoteTracker,
         },
         cluster_slots_service::{cluster_slots::ClusterSlots, ClusterSlotsUpdateSender},
         commitment_service::{
@@ -79,7 +78,7 @@ use {
         commitment::BlockCommitmentCache,
         installed_scheduler_pool::BankWithScheduler,
         prioritization_fee_cache::PrioritizationFeeCache,
-        vote_sender_types::ReplayVoteSender,
+        vote_sender_types::{AlpenglowVoteReceiver, ReplayVoteSender},
     },
     solana_sdk::{
         clock::{BankId, Slot, NUM_CONSECUTIVE_LEADER_SLOTS},
@@ -1245,7 +1244,7 @@ impl ReplayStage {
                     );
                 } else {
                     let new_finalized_certificate_slot =
-                        Self::ingest_gossip_alpenglow_votes_into_certificate_pool(
+                        Self::ingest_alpenglow_votes_into_certificate_pool(
                             &my_pubkey,
                             &alpenglow_vote_receiver,
                             &mut cert_pool,
@@ -2070,7 +2069,7 @@ impl ReplayStage {
         }
     }
 
-    fn ingest_gossip_alpenglow_votes_into_certificate_pool(
+    fn ingest_alpenglow_votes_into_certificate_pool(
         id: &Pubkey,
         alpenglow_vote_receiver: &AlpenglowVoteReceiver,
         cert_pool: &mut CertificatePool,

core/src/tpu.rs

@@ -13,8 +13,8 @@ use {
         banking_stage::BankingStage,
         banking_trace::{Channels, TracerThread},
         cluster_info_vote_listener::{
-            AlpenglowVoteSender, ClusterInfoVoteListener, DuplicateConfirmedSlotsSender,
-            GossipVerifiedVoteHashSender, VerifiedVoteSender, VoteTracker,
+            ClusterInfoVoteListener, DuplicateConfirmedSlotsSender, GossipVerifiedVoteHashSender,
+            VerifiedVoteSender, VoteTracker,
         },
         fetch_stage::FetchStage,
         forwarding_stage::ForwardingStage,
@@ -42,7 +42,7 @@ use {
         bank_forks::BankForks,
         prioritization_fee_cache::PrioritizationFeeCache,
         root_bank_cache::RootBankCache,
-        vote_sender_types::{ReplayVoteReceiver, ReplayVoteSender},
+        vote_sender_types::{AlpenglowVoteSender, ReplayVoteReceiver, ReplayVoteSender},
     },
     solana_sdk::{clock::Slot, pubkey::Pubkey, quic::NotifyKeyUpdate, signature::Keypair},
     solana_streamer::{

core/src/tvu.rs

@@ -6,8 +6,8 @@ use {
         alpenglow_consensus::vote_history_storage::VoteHistoryStorage,
         banking_trace::BankingTracer,
         cluster_info_vote_listener::{
-            AlpenglowVoteReceiver, DuplicateConfirmedSlotsReceiver, GossipVerifiedVoteHashReceiver,
-            VerifiedVoteReceiver, VoteTracker,
+            DuplicateConfirmedSlotsReceiver, GossipVerifiedVoteHashReceiver, VerifiedVoteReceiver,
+            VoteTracker,
         },
         cluster_slots_service::{cluster_slots::ClusterSlots, ClusterSlotsService},
         completed_data_sets_service::CompletedDataSetsSender,
@@ -41,9 +41,11 @@ use {
         rpc_subscriptions::RpcSubscriptions, slot_status_notifier::SlotStatusNotifier,
     },
     solana_runtime::{
-        accounts_background_service::AbsRequestSender, bank_forks::BankForks,
-        commitment::BlockCommitmentCache, prioritization_fee_cache::PrioritizationFeeCache,
-        vote_sender_types::ReplayVoteSender,
+        accounts_background_service::AbsRequestSender,
+        bank_forks::BankForks,
+        commitment::BlockCommitmentCache,
+        prioritization_fee_cache::PrioritizationFeeCache,
+        vote_sender_types::{AlpenglowVoteReceiver, ReplayVoteSender},
     },
     solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Keypair},
     solana_turbine::retransmit_stage::RetransmitStage,

runtime/src/vote_sender_types.rs

@@ -1,7 +1,12 @@
 use {
+    alpenglow_vote::vote::Vote as AlpenglowVote,
     crossbeam_channel::{Receiver, Sender},
+    solana_sdk::{pubkey::Pubkey, transaction::Transaction},
     solana_vote::vote_parser::ParsedVote,
 };
 
 pub type ReplayVoteSender = Sender<ParsedVote>;
 pub type ReplayVoteReceiver = Receiver<ParsedVote>;
+
+pub type AlpenglowVoteSender = Sender<(AlpenglowVote, Pubkey, Transaction)>;
+pub type AlpenglowVoteReceiver = Receiver<(AlpenglowVote, Pubkey, Transaction)>;