Move entry/poh to own crate to speed up poh bench build (#18225)

core/Cargo.toml

@@ -48,6 +48,7 @@ solana-banks-server = { path = "../banks-server", version = "=1.8.0" }
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
 solana-client = { path = "../client", version = "=1.8.0" }
 solana-config-program = { path = "../programs/config", version = "=1.8.0" }
+solana-entry = { path = "../entry", version = "=1.8.0" }
 solana-gossip = { path = "../gossip", version = "=1.8.0" }
 solana-ledger = { path = "../ledger", version = "=1.8.0" }
 solana-logger = { path = "../logger", version = "=1.8.0" }

core/benches/banking_stage.rs

@@ -10,10 +10,10 @@ use rayon::prelude::*;
 use solana_core::banking_stage::{BankingStage, BankingStageStats};
 use solana_core::cost_model::CostModel;
 use solana_core::cost_tracker::CostTracker;
+use solana_entry::entry::{next_hash, Entry};
 use solana_gossip::cluster_info::ClusterInfo;
 use solana_gossip::cluster_info::Node;
 use solana_ledger::blockstore_processor::process_entries;
-use solana_ledger::entry::{next_hash, Entry};
 use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
 use solana_perf::packet::to_packets_chunked;

core/benches/blockstore.rs

@@ -4,9 +4,9 @@ extern crate solana_ledger;
 extern crate test;
 
 use rand::Rng;
+use solana_entry::entry::{create_ticks, Entry};
 use solana_ledger::{
     blockstore::{entries_to_test_shreds, Blockstore},
-    entry::{create_ticks, Entry},
     get_tmp_ledger_path,
 };
 use solana_sdk::{clock::Slot, hash::Hash};

core/benches/retransmit_stage.rs

@@ -5,9 +5,9 @@ extern crate test;
 
 use log::*;
 use solana_core::retransmit_stage::retransmitter;
+use solana_entry::entry::Entry;
 use solana_gossip::cluster_info::{ClusterInfo, Node};
 use solana_gossip::contact_info::ContactInfo;
-use solana_ledger::entry::Entry;
 use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
 use solana_ledger::shred::Shredder;

core/benches/shredder.rs

@@ -5,7 +5,7 @@ extern crate test;
 
 use rand::seq::SliceRandom;
 use raptorq::{Decoder, Encoder};
-use solana_ledger::entry::{create_ticks, Entry};
+use solana_entry::entry::{create_ticks, Entry};
 use solana_ledger::shred::{
     max_entries_per_n_shred, max_ticks_per_n_shreds, ProcessShredsStats, Shred, Shredder,
     MAX_DATA_SHREDS_PER_FEC_BLOCK, SHRED_PAYLOAD_SIZE, SIZE_OF_CODING_SHRED_HEADERS,

core/src/banking_stage.rs

@@ -6,8 +6,9 @@ use crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError};
 use itertools::Itertools;
 use lru::LruCache;
 use retain_mut::RetainMut;
+use solana_entry::entry::hash_transactions;
 use solana_gossip::cluster_info::ClusterInfo;
-use solana_ledger::{blockstore_processor::TransactionStatusSender, entry::hash_transactions};
+use solana_ledger::blockstore_processor::TransactionStatusSender;
 use solana_measure::measure::Measure;
 use solana_metrics::{inc_new_counter_debug, inc_new_counter_info};
 use solana_perf::{
@@ -23,10 +24,10 @@ use solana_runtime::{
         TransactionExecutionResult,
     },
     bank_utils,
-    hashed_transaction::HashedTransaction,
     transaction_batch::TransactionBatch,
     vote_sender_types::ReplayVoteSender,
 };
+use solana_sdk::hashed_transaction::HashedTransaction;
 use solana_sdk::{
     clock::{
         Slot, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE, MAX_TRANSACTION_FORWARDING_DELAY,
@@ -1572,10 +1573,10 @@ mod tests {
     use crate::cost_model::CostModel;
     use crossbeam_channel::unbounded;
     use itertools::Itertools;
+    use solana_entry::entry::{next_entry, Entry, EntrySlice};
     use solana_gossip::cluster_info::Node;
     use solana_ledger::{
         blockstore::{entries_to_test_shreds, Blockstore},
-        entry::{next_entry, Entry, EntrySlice},
         genesis_utils::{create_genesis_config, GenesisConfigInfo},
         get_tmp_ledger_path,
         leader_schedule_cache::LeaderScheduleCache,

core/src/broadcast_stage.rs

@@ -446,10 +446,10 @@ pub fn broadcast_shreds(
 pub mod test {
     use super::*;
     use crossbeam_channel::unbounded;
+    use solana_entry::entry::create_ticks;
     use solana_gossip::cluster_info::{ClusterInfo, Node};
     use solana_ledger::{
         blockstore::{make_slot_entries, Blockstore},
-        entry::create_ticks,
         genesis_utils::{create_genesis_config, GenesisConfigInfo},
         get_tmp_ledger_path,
         shred::{max_ticks_per_n_shreds, ProcessShredsStats, Shredder},

core/src/broadcast_stage/broadcast_duplicates_run.rs

@@ -1,5 +1,6 @@
 use super::*;
-use solana_ledger::{entry::Entry, shred::Shredder};
+use solana_entry::entry::Entry;
+use solana_ledger::shred::Shredder;
 use solana_runtime::blockhash_queue::BlockhashQueue;
 use solana_sdk::{
     hash::Hash,

core/src/broadcast_stage/broadcast_fake_shreds_run.rs

@@ -1,5 +1,5 @@
 use super::*;
-use solana_ledger::entry::Entry;
+use solana_entry::entry::Entry;
 use solana_ledger::shred::Shredder;
 use solana_sdk::hash::Hash;
 use solana_sdk::signature::Keypair;

core/src/broadcast_stage/broadcast_utils.rs

@@ -1,5 +1,6 @@
 use crate::result::Result;
-use solana_ledger::{entry::Entry, shred::Shred};
+use solana_entry::entry::Entry;
+use solana_ledger::shred::Shred;
 use solana_poh::poh_recorder::WorkingBankEntry;
 use solana_runtime::bank::Bank;
 use solana_sdk::clock::Slot;

core/src/broadcast_stage/standard_broadcast_run.rs

@@ -5,12 +5,9 @@ use super::{
     *,
 };
 use crate::{broadcast_stage::broadcast_utils::UnfinishedSlotInfo, cluster_nodes::ClusterNodes};
-use solana_ledger::{
-    entry::Entry,
-    shred::{
-        ProcessShredsStats, Shred, Shredder, MAX_DATA_SHREDS_PER_FEC_BLOCK,
-        SHRED_TICK_REFERENCE_MASK,
-    },
+use solana_entry::entry::Entry;
+use solana_ledger::shred::{
+    ProcessShredsStats, Shred, Shredder, MAX_DATA_SHREDS_PER_FEC_BLOCK, SHRED_TICK_REFERENCE_MASK,
 };
 use solana_sdk::{pubkey::Pubkey, signature::Keypair, timing::duration_as_us};
 use std::{collections::HashMap, sync::RwLock, time::Duration};
@@ -502,11 +499,11 @@ impl BroadcastRun for StandardBroadcastRun {
 #[cfg(test)]
 mod test {
     use super::*;
+    use solana_entry::entry::create_ticks;
     use solana_gossip::cluster_info::{ClusterInfo, Node};
     use solana_ledger::genesis_utils::create_genesis_config;
     use solana_ledger::{
-        blockstore::Blockstore, entry::create_ticks, get_tmp_ledger_path,
-        shred::max_ticks_per_n_shreds,
+        blockstore::Blockstore, get_tmp_ledger_path, shred::max_ticks_per_n_shreds,
     };
     use solana_runtime::bank::Bank;
     use solana_sdk::{

core/src/completed_data_sets_service.rs

@@ -1,6 +1,6 @@
 use crossbeam_channel::{Receiver, RecvTimeoutError, Sender};
+use solana_entry::entry::Entry;
 use solana_ledger::blockstore::{Blockstore, CompletedDataSetInfo};
-use solana_ledger::entry::Entry;
 use solana_rpc::{max_slots::MaxSlots, rpc_subscriptions::RpcSubscriptions};
 use solana_sdk::signature::Signature;
 use std::{

core/src/replay_stage.rs

@@ -23,12 +23,12 @@ use crate::{
     window_service::DuplicateSlotReceiver,
 };
 use solana_client::rpc_response::SlotUpdate;
+use solana_entry::entry::VerifyRecyclers;
 use solana_gossip::cluster_info::ClusterInfo;
 use solana_ledger::{
     block_error::BlockError,
     blockstore::Blockstore,
     blockstore_processor::{self, BlockstoreProcessorError, TransactionStatusSender},
-    entry::VerifyRecyclers,
     leader_schedule_cache::LeaderScheduleCache,
 };
 use solana_measure::measure::Measure;
@@ -2674,12 +2674,12 @@ mod tests {
         vote_simulator::{self, VoteSimulator},
     };
     use crossbeam_channel::unbounded;
+    use solana_entry::entry::{self, Entry};
     use solana_gossip::{cluster_info::Node, crds::Cursor};
     use solana_ledger::{
         blockstore::make_slot_entries,
         blockstore::{entries_to_test_shreds, BlockstoreError},
         create_new_tmp_ledger,
-        entry::{self, Entry},
         genesis_utils::{create_genesis_config, create_genesis_config_with_leader},
         get_tmp_ledger_path,
         shred::{

core/src/validator.rs

@@ -18,6 +18,7 @@ use crate::{
 };
 use crossbeam_channel::{bounded, unbounded};
 use rand::{thread_rng, Rng};
+use solana_entry::poh::compute_hash_time_ns;
 use solana_gossip::{
     cluster_info::{
         ClusterInfo, Node, DEFAULT_CONTACT_DEBUG_INTERVAL_MILLIS,
@@ -33,7 +34,6 @@ use solana_ledger::{
     blockstore_processor::{self, TransactionStatusSender},
     leader_schedule::FixedSchedule,
     leader_schedule_cache::LeaderScheduleCache,
-    poh::compute_hash_time_ns,
 };
 use solana_measure::measure::Measure;
 use solana_metrics::datapoint_info;
@@ -1626,8 +1626,8 @@ mod tests {
     fn test_backup_and_clear_blockstore() {
         use std::time::Instant;
         solana_logger::setup();
-        use solana_ledger::get_tmp_ledger_path;
-        use solana_ledger::{blockstore, entry};
+        use solana_entry::entry;
+        use solana_ledger::{blockstore, get_tmp_ledger_path};
         let blockstore_path = get_tmp_ledger_path!();
         {
             let blockstore = Blockstore::open(&blockstore_path).unwrap();

core/src/window_service.rs

@@ -625,10 +625,10 @@ impl WindowService {
 #[cfg(test)]
 mod test {
     use super::*;
+    use solana_entry::entry::{create_ticks, Entry};
     use solana_gossip::contact_info::ContactInfo;
     use solana_ledger::{
         blockstore::{make_many_slot_entries, Blockstore},
-        entry::{create_ticks, Entry},
         genesis_utils::create_genesis_config_with_leader,
         get_tmp_ledger_path,
         shred::{DataShredHeader, Shredder},