Move BankingStage impl modules into banking_stage directory (#31864)

The core/src/ directory is already pretty crowded, and moving these
items into the subdirectory more clearly identifies that they are tied
to banking_stage.

core/benches/banking_stage.rs

@@ -11,13 +11,15 @@ use {
     solana_client::connection_cache::ConnectionCache,
     solana_core::{
         banking_stage::{
-            committer::Committer, consumer::Consumer, BankingStage, BankingStageStats,
-        },
-        banking_trace::{BankingPacketBatch, BankingTracer},
-        leader_slot_banking_stage_metrics::LeaderSlotMetricsTracker,
+            committer::Committer,
+            consumer::Consumer,
+            leader_slot_metrics::LeaderSlotMetricsTracker,
             qos_service::QosService,
             unprocessed_packet_batches::*,
             unprocessed_transaction_storage::{ThreadType, UnprocessedTransactionStorage},
+            BankingStage, BankingStageStats,
+        },
+        banking_trace::{BankingPacketBatch, BankingTracer},
     },
     solana_entry::entry::{next_hash, Entry},
     solana_gossip::cluster_info::{ClusterInfo, Node},

core/benches/consumer.rs

@@ -7,9 +7,8 @@ use {
         iter::IndexedParallelIterator,
         prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator},
     },
-    solana_core::{
-        banking_stage::{committer::Committer, consumer::Consumer},
-        qos_service::QosService,
+    solana_core::banking_stage::{
+        committer::Committer, consumer::Consumer, qos_service::QosService,
     },
     solana_entry::entry::Entry,
     solana_ledger::{

core/src/banking_stage.rs

@@ -4,21 +4,18 @@
 
 use {
     self::{
+        committer::Committer,
         consumer::Consumer,
         decision_maker::{BufferedPacketsDecision, DecisionMaker},
         forwarder::Forwarder,
-        packet_receiver::PacketReceiver,
-    },
-    crate::{
-        banking_stage::committer::Committer,
-        banking_trace::BankingPacketReceiver,
         latest_unprocessed_votes::{LatestUnprocessedVotes, VoteSource},
-        leader_slot_banking_stage_metrics::LeaderSlotMetricsTracker,
+        leader_slot_metrics::LeaderSlotMetricsTracker,
+        packet_receiver::PacketReceiver,
         qos_service::QosService,
-        tracer_packet_stats::TracerPacketStats,
         unprocessed_packet_batches::*,
         unprocessed_transaction_storage::{ThreadType, UnprocessedTransactionStorage},
     },
+    crate::{banking_trace::BankingPacketReceiver, tracer_packet_stats::TracerPacketStats},
     crossbeam_channel::RecvTimeoutError,
     histogram::Histogram,
     solana_client::connection_cache::ConnectionCache,
@@ -43,11 +40,24 @@ use {
     },
 };
 
+// Below modules are pub to allow use by banking_stage bench
 pub mod committer;
 pub mod consumer;
+pub mod leader_slot_metrics;
+pub mod qos_service;
+pub mod unprocessed_packet_batches;
+pub mod unprocessed_transaction_storage;
+
 mod decision_maker;
+mod forward_packet_batches_by_accounts;
 mod forwarder;
+mod immutable_deserialized_packet;
+mod latest_unprocessed_votes;
+mod leader_slot_timing_metrics;
+mod multi_iterator_scanner;
+mod packet_deserializer;
 mod packet_receiver;
+mod read_write_account_set;
 
 #[allow(dead_code)]
 mod scheduler_messages;

core/src/banking_stage/committer.rs

@@ -1,5 +1,5 @@
 use {
-    crate::leader_slot_banking_stage_timing_metrics::LeaderExecuteAndCommitTimings,
+    super::leader_slot_timing_metrics::LeaderExecuteAndCommitTimings,
     itertools::Itertools,
     solana_ledger::{
         blockstore_processor::TransactionStatusSender, token_balances::collect_token_balances,

core/src/banking_stage/consume_worker.rs

@@ -126,14 +126,12 @@ fn try_drain_iter<T>(work: T, receiver: &Receiver<T>) -> impl Iterator<Item = T>
 mod tests {
     use {
         super::*,
-        crate::{
-            banking_stage::{
+        crate::banking_stage::{
             committer::Committer,
+            qos_service::QosService,
             scheduler_messages::{TransactionBatchId, TransactionId},
             tests::{create_slow_genesis_config, sanitize_transactions, simulate_poh},
         },
-            qos_service::QosService,
-        },
         crossbeam_channel::unbounded,
         solana_ledger::{
             blockstore::Blockstore, genesis_utils::GenesisConfigInfo,

core/src/banking_stage/consumer.rs

@@ -1,15 +1,12 @@
 use {
     super::{
-        committer::{CommitTransactionDetails, Committer},
-        BankingStageStats,
-    },
-    crate::{
-        banking_stage::committer::PreBalanceInfo,
+        committer::{CommitTransactionDetails, Committer, PreBalanceInfo},
         immutable_deserialized_packet::ImmutableDeserializedPacket,
-        leader_slot_banking_stage_metrics::{LeaderSlotMetricsTracker, ProcessTransactionsSummary},
-        leader_slot_banking_stage_timing_metrics::LeaderExecuteAndCommitTimings,
+        leader_slot_metrics::{LeaderSlotMetricsTracker, ProcessTransactionsSummary},
+        leader_slot_timing_metrics::LeaderExecuteAndCommitTimings,
         qos_service::QosService,
         unprocessed_transaction_storage::{ConsumeScannerPayload, UnprocessedTransactionStorage},
+        BankingStageStats,
     },
     itertools::Itertools,
     solana_ledger::token_balances::collect_token_balances,
@@ -720,11 +717,9 @@ impl Consumer {
 mod tests {
     use {
         super::*,
-        crate::{
-            banking_stage::tests::{
-                create_slow_genesis_config, sanitize_transactions, simulate_poh,
-            },
+        crate::banking_stage::{
             immutable_deserialized_packet::DeserializedPacketError,
+            tests::{create_slow_genesis_config, sanitize_transactions, simulate_poh},
             unprocessed_packet_batches::{DeserializedPacket, UnprocessedPacketBatches},
             unprocessed_transaction_storage::ThreadType,
         },

core/src/banking_stage/forward_packet_batches_by_accounts.rs

@@ -1,5 +1,5 @@
 use {
-    crate::immutable_deserialized_packet::ImmutableDeserializedPacket,
+    super::immutable_deserialized_packet::ImmutableDeserializedPacket,
     solana_perf::packet::Packet,
     solana_runtime::{
         block_cost_limits,
@@ -136,7 +136,7 @@ impl ForwardPacketBatchesByAccounts {
 mod tests {
     use {
         super::*,
-        crate::unprocessed_packet_batches::DeserializedPacket,
+        crate::banking_stage::unprocessed_packet_batches::DeserializedPacket,
         solana_sdk::{
             compute_budget::ComputeBudgetInstruction, feature_set::FeatureSet, message::Message,
             pubkey::Pubkey, system_instruction, transaction::Transaction,

core/src/banking_stage/forward_worker.rs

@@ -84,13 +84,11 @@ fn try_drain_iter<T>(work: T, receiver: &Receiver<T>) -> impl Iterator<Item = T>
 mod tests {
     use {
         super::*,
-        crate::{
-            banking_stage::{
+        crate::banking_stage::{
+            immutable_deserialized_packet::ImmutableDeserializedPacket,
             scheduler_messages::TransactionId,
             tests::{create_slow_genesis_config, new_test_cluster_info, simulate_poh},
         },
-            immutable_deserialized_packet::ImmutableDeserializedPacket,
-        },
         crossbeam_channel::unbounded,
         solana_client::connection_cache::ConnectionCache,
         solana_ledger::{

core/src/banking_stage/forwarder.rs

@@ -1,11 +1,13 @@
 use {
-    super::{BankingStageStats, ForwardOption},
-    crate::{
+    super::{
         forward_packet_batches_by_accounts::ForwardPacketBatchesByAccounts,
-        leader_slot_banking_stage_metrics::LeaderSlotMetricsTracker,
+        leader_slot_metrics::LeaderSlotMetricsTracker,
+        unprocessed_transaction_storage::UnprocessedTransactionStorage, BankingStageStats,
+        ForwardOption,
+    },
+    crate::{
         next_leader::{next_leader, next_leader_tpu_vote},
         tracer_packet_stats::TracerPacketStats,
-        unprocessed_transaction_storage::UnprocessedTransactionStorage,
     },
     solana_client::{connection_cache::ConnectionCache, tpu_connection::TpuConnection},
     solana_gossip::cluster_info::ClusterInfo,
@@ -269,8 +271,8 @@ impl Forwarder {
 mod tests {
     use {
         super::*,
-        crate::{
-            banking_stage::tests::{create_slow_genesis_config_with_leader, new_test_cluster_info},
+        crate::banking_stage::{
+            tests::{create_slow_genesis_config_with_leader, new_test_cluster_info},
             unprocessed_packet_batches::{DeserializedPacket, UnprocessedPacketBatches},
             unprocessed_transaction_storage::ThreadType,
         },

core/src/banking_stage/latest_unprocessed_votes.rs

@@ -1,5 +1,5 @@
 use {
-    crate::{
+    super::{
         forward_packet_batches_by_accounts::ForwardPacketBatchesByAccounts,
         immutable_deserialized_packet::{DeserializedPacketError, ImmutableDeserializedPacket},
     },

core/src/banking_stage/leader_slot_metrics.rs

@@ -1,6 +1,6 @@
 use {
-    crate::{
-        leader_slot_banking_stage_timing_metrics::*,
+    super::{
+        leader_slot_timing_metrics::{LeaderExecuteAndCommitTimings, LeaderSlotTimingMetrics},
         unprocessed_transaction_storage::InsertPacketBatchSummary,
     },
     solana_poh::poh_recorder::BankStart,

core/src/banking_stage/packet_deserializer.rs

@@ -1,9 +1,9 @@
 //! Deserializes packets from sigverify stage. Owned by banking stage.
 
 use {
+    super::immutable_deserialized_packet::ImmutableDeserializedPacket,
     crate::{
         banking_trace::{BankingPacketBatch, BankingPacketReceiver},
-        immutable_deserialized_packet::ImmutableDeserializedPacket,
         sigverify::SigverifyTracerPacketStats,
     },
     crossbeam_channel::RecvTimeoutError,

core/src/banking_stage/packet_receiver.rs

@@ -1,13 +1,12 @@
 use {
-    super::BankingStageStats,
-    crate::{
-        banking_trace::BankingPacketReceiver,
+    super::{
         immutable_deserialized_packet::ImmutableDeserializedPacket,
-        leader_slot_banking_stage_metrics::LeaderSlotMetricsTracker,
+        leader_slot_metrics::LeaderSlotMetricsTracker,
         packet_deserializer::{PacketDeserializer, ReceivePacketResults},
-        tracer_packet_stats::TracerPacketStats,
         unprocessed_transaction_storage::UnprocessedTransactionStorage,
+        BankingStageStats,
     },
+    crate::{banking_trace::BankingPacketReceiver, tracer_packet_stats::TracerPacketStats},
     crossbeam_channel::RecvTimeoutError,
     solana_measure::{measure::Measure, measure_us},
     solana_runtime::bank_forks::BankForks,

core/src/banking_stage/qos_service.rs

@@ -4,7 +4,7 @@
 //!
 
 use {
-    crate::banking_stage::{committer::CommitTransactionDetails, BatchedTransactionDetails},
+    super::{committer::CommitTransactionDetails, BatchedTransactionDetails},
     crossbeam_channel::{unbounded, Receiver, Sender},
     solana_measure::measure::Measure,
     solana_runtime::{bank::Bank, cost_model::CostModel, transaction_cost::TransactionCost},

core/src/banking_stage/scheduler_messages.rs

@@ -1,5 +1,5 @@
 use {
-    crate::immutable_deserialized_packet::ImmutableDeserializedPacket,
+    super::immutable_deserialized_packet::ImmutableDeserializedPacket,
     solana_sdk::{clock::Slot, transaction::SanitizedTransaction},
     std::sync::Arc,
 };

core/src/banking_stage/unprocessed_packet_batches.rs

@@ -1,5 +1,5 @@
 use {
-    crate::immutable_deserialized_packet::{DeserializedPacketError, ImmutableDeserializedPacket},
+    super::immutable_deserialized_packet::{DeserializedPacketError, ImmutableDeserializedPacket},
     min_max_heap::MinMaxHeap,
     solana_perf::packet::Packet,
     solana_sdk::hash::Hash,

core/src/banking_stage/unprocessed_transaction_storage.rs

@@ -1,18 +1,18 @@
 use {
-    crate::{
-        banking_stage::{BankingStageStats, FilterForwardingResults, ForwardOption},
+    super::{
         forward_packet_batches_by_accounts::ForwardPacketBatchesByAccounts,
         immutable_deserialized_packet::ImmutableDeserializedPacket,
         latest_unprocessed_votes::{
             LatestUnprocessedVotes, LatestValidatorVotePacket, VoteBatchInsertionMetrics,
             VoteSource,
         },
-        leader_slot_banking_stage_metrics::LeaderSlotMetricsTracker,
+        leader_slot_metrics::LeaderSlotMetricsTracker,
         multi_iterator_scanner::{MultiIteratorScanner, ProcessingDecision},
         read_write_account_set::ReadWriteAccountSet,
         unprocessed_packet_batches::{
             DeserializedPacket, PacketBatchInsertionMetrics, UnprocessedPacketBatches,
         },
+        BankingStageStats, FilterForwardingResults, ForwardOption,
     },
     itertools::Itertools,
     min_max_heap::MinMaxHeap,

core/src/lib.rs

@@ -28,27 +28,18 @@ pub mod drop_bank_service;
 pub mod duplicate_repair_status;
 pub mod fetch_stage;
 pub mod fork_choice;
-pub mod forward_packet_batches_by_accounts;
 pub mod gen_keys;
 pub mod heaviest_subtree_fork_choice;
-pub mod immutable_deserialized_packet;
-mod latest_unprocessed_votes;
 pub mod latest_validator_votes_for_frozen_banks;
-pub mod leader_slot_banking_stage_metrics;
-pub mod leader_slot_banking_stage_timing_metrics;
 pub mod ledger_cleanup_service;
 pub mod ledger_metric_report_service;
-pub mod multi_iterator_scanner;
 pub mod next_leader;
 pub mod optimistic_confirmation_verifier;
 pub mod outstanding_requests;
-pub mod packet_deserializer;
 pub mod packet_threshold;
 pub mod poh_timing_report_service;
 pub mod poh_timing_reporter;
 pub mod progress_map;
-pub mod qos_service;
-pub mod read_write_account_set;
 pub mod repair_generic_traversal;
 pub mod repair_response;
 pub mod repair_service;
@@ -79,8 +70,6 @@ pub mod tracer_packet_stats;
 pub mod tree_diff;
 pub mod tvu;
 pub mod unfrozen_gossip_verified_vote_hashes;
-pub mod unprocessed_packet_batches;
-pub mod unprocessed_transaction_storage;
 pub mod validator;
 pub mod verified_vote_packets;
 pub mod vote_simulator;