Remove stub core/src/genesis_utils.rs (#8999)

banking-bench/src/main.rs

@@ -2,29 +2,36 @@ use crossbeam_channel::unbounded;
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
-use solana_core::banking_stage::{create_test_recorder, BankingStage};
+use solana_core::{
-use solana_core::cluster_info::ClusterInfo;
+    banking_stage::{create_test_recorder, BankingStage},
-use solana_core::cluster_info::Node;
+    cluster_info::ClusterInfo,
-use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    cluster_info::Node,
-use solana_core::poh_recorder::PohRecorder;
+    poh_recorder::PohRecorder,
-use solana_core::poh_recorder::WorkingBankEntry;
+    poh_recorder::WorkingBankEntry,
-use solana_ledger::bank_forks::BankForks;
+};
-use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
+use solana_ledger::{
+    bank_forks::BankForks,
+    blockstore::Blockstore,
+    genesis_utils::{create_genesis_config, GenesisConfigInfo},
+    get_tmp_ledger_path,
+};
 use solana_measure::measure::Measure;
 use solana_perf::packet::to_packets_chunked;
 use solana_runtime::bank::Bank;
-use solana_sdk::hash::Hash;
+use solana_sdk::{
-use solana_sdk::pubkey::Pubkey;
+    hash::Hash,
-use solana_sdk::signature::Keypair;
+    pubkey::Pubkey,
-use solana_sdk::signature::Signature;
+    signature::Keypair,
-use solana_sdk::system_transaction;
+    signature::Signature,
-use solana_sdk::timing::{duration_as_us, timestamp};
+    system_transaction,
-use solana_sdk::transaction::Transaction;
+    timing::{duration_as_us, timestamp},
-use std::sync::atomic::Ordering;
+    transaction::Transaction,
-use std::sync::mpsc::Receiver;
+};
-use std::sync::{Arc, Mutex, RwLock};
+use std::{
-use std::thread::sleep;
+    sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex, RwLock},
-use std::time::{Duration, Instant};
+    thread::sleep,
+    time::{Duration, Instant},
+};
 
 fn check_txs(
     receiver: &Arc<Receiver<WorkingBankEntry>>,

core/benches/banking_stage.rs

@@ -9,10 +9,10 @@ use rayon::prelude::*;
 use solana_core::banking_stage::{create_test_recorder, BankingStage};
 use solana_core::cluster_info::ClusterInfo;
 use solana_core::cluster_info::Node;
-use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_core::poh_recorder::WorkingBankEntry;
 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;
 use solana_perf::test_tx::test_tx;

core/benches/retransmit_stage.rs

@@ -6,9 +6,9 @@ extern crate test;
 use log::*;
 use solana_core::cluster_info::{ClusterInfo, Node};
 use solana_core::contact_info::ContactInfo;
-use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_core::retransmit_stage::retransmitter;
 use solana_ledger::bank_forks::BankForks;
+use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
 use solana_measure::measure::Measure;
 use solana_perf::packet::to_packets_chunked;

core/src/banking_stage.rs

@@ -1012,9 +1012,7 @@ pub fn create_test_recorder(
 mod tests {
     use super::*;
     use crate::{
-        cluster_info::Node,
+        cluster_info::Node, poh_recorder::WorkingBank,
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        poh_recorder::WorkingBank,
         transaction_status_service::TransactionStatusService,
     };
     use crossbeam_channel::unbounded;
@@ -1023,6 +1021,7 @@ mod tests {
     use solana_ledger::{
         blockstore::entries_to_test_shreds,
         entry::{next_entry, Entry, EntrySlice},
+        genesis_utils::{create_genesis_config, GenesisConfigInfo},
         get_tmp_ledger_path,
     };
     use solana_perf::packet::to_packets;

core/src/blockstream_service.rs

@@ -100,12 +100,12 @@ impl BlockstreamService {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use bincode::{deserialize, serialize};
     use chrono::{DateTime, FixedOffset};
     use serde_json::Value;
     use solana_ledger::create_new_tmp_ledger;
     use solana_ledger::entry::{create_ticks, Entry};
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, Signer};
     use solana_sdk::system_transaction;

core/src/broadcast_stage.rs

@@ -331,14 +331,12 @@ impl BroadcastStage {
 #[cfg(test)]
 pub mod test {
     use super::*;
-    use crate::{
+    use crate::cluster_info::{ClusterInfo, Node};
-        cluster_info::{ClusterInfo, Node},
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-    };
     use crossbeam_channel::unbounded;
     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, Shredder, RECOMMENDED_FEC_RATE},
     };

core/src/broadcast_stage/broadcast_utils.rs

@@ -76,7 +76,7 @@ pub(super) fn recv_slot_entries(receiver: &Receiver<WorkingBankEntry>) -> Result
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::genesis_config::GenesisConfig;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::system_transaction;

core/src/broadcast_stage/standard_broadcast_run.rs

@@ -354,7 +354,7 @@ impl BroadcastRun for StandardBroadcastRun {
 mod test {
     use super::*;
     use crate::cluster_info::{ClusterInfo, Node};
-    use crate::genesis_utils::create_genesis_config;
+    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,

core/src/commitment.rs

@@ -230,7 +230,7 @@ impl AggregateCommitmentService {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::pubkey::Pubkey;
     use solana_stake_program::stake_state;
     use solana_vote_program::vote_state::{self, VoteStateVersions};

core/src/genesis_utils.rs

@@ -1 +0,0 @@
-pub use solana_ledger::genesis_utils::*;

core/src/lib.rs

@@ -28,7 +28,6 @@ pub mod crds_value;
 pub mod epoch_slots;
 pub mod fetch_stage;
 pub mod gen_keys;
-pub mod genesis_utils;
 pub mod gossip_service;
 pub mod ledger_cleanup_service;
 pub mod local_vote_signer_service;

core/src/poh_recorder.rs

@@ -511,8 +511,8 @@ impl PohRecorder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use bincode::serialize;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::{blockstore::Blockstore, blockstore_meta::SlotMeta, get_tmp_ledger_path};
     use solana_perf::test_tx::test_tx;
     use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;

core/src/poh_service.rs

@@ -120,8 +120,8 @@ impl PohService {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use crate::poh_recorder::WorkingBank;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
     use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
     use solana_perf::test_tx::test_tx;

core/src/replay_stage.rs

@@ -1294,7 +1294,6 @@ pub(crate) mod tests {
         commitment::BlockCommitment,
         consensus::test::{initialize_state, VoteSimulator},
         consensus::Tower,
-        genesis_utils::{create_genesis_config, create_genesis_config_with_leader},
         replay_stage::ReplayStage,
         transaction_status_service::TransactionStatusService,
     };
@@ -1305,6 +1304,7 @@ pub(crate) mod tests {
         blockstore::{entries_to_test_shreds, BlockstoreError},
         create_new_tmp_ledger,
         entry::{self, next_entry, Entry},
+        genesis_utils::{create_genesis_config, create_genesis_config_with_leader},
         get_tmp_ledger_path,
         shred::{
             CodingShredHeader, DataShredHeader, Shred, ShredCommonHeader, DATA_COMPLETE_SHRED,

core/src/retransmit_stage.rs

@@ -278,9 +278,9 @@ impl RetransmitStage {
 mod tests {
     use super::*;
     use crate::contact_info::ContactInfo;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::blockstore_processor::{process_blockstore, ProcessOptions};
     use solana_ledger::create_new_tmp_ledger;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_net_utils::find_available_port_in_range;
     use solana_perf::packet::{Meta, Packet, Packets};
     use solana_sdk::pubkey::Pubkey;

core/src/rpc.rs

@@ -1182,17 +1182,18 @@ impl RpcSol for RpcSolImpl {
 pub mod tests {
     use super::*;
     use crate::{
-        commitment::BlockCommitment,
+        commitment::BlockCommitment, contact_info::ContactInfo,
-        contact_info::ContactInfo,
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
         replay_stage::tests::create_test_transactions_and_populate_blockstore,
     };
     use bincode::deserialize;
     use jsonrpc_core::{MetaIoHandler, Output, Response, Value};
     use solana_client::rpc_response::{RpcEncodedTransaction, RpcTransactionWithStatusMeta};
     use solana_ledger::{
-        blockstore::entries_to_test_shreds, blockstore_processor::fill_blockstore_slot_with_ticks,
+        blockstore::entries_to_test_shreds,
-        entry::next_entry_mut, get_tmp_ledger_path,
+        blockstore_processor::fill_blockstore_slot_with_ticks,
+        entry::next_entry_mut,
+        genesis_utils::{create_genesis_config, GenesisConfigInfo},
+        get_tmp_ledger_path,
     };
     use solana_sdk::{
         fee_calculator::DEFAULT_BURN_PERCENT,

core/src/rpc_pubsub.rs

@@ -279,12 +279,12 @@ impl RpcSolPubSub for RpcSolPubSubImpl {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use crate::rpc_subscriptions::tests::robust_poll_or_panic;
     use jsonrpc_core::{futures::sync::mpsc, Response};
     use jsonrpc_pubsub::{PubSubHandler, Session};
     use solana_budget_program::{self, budget_instruction};
     use solana_ledger::bank_forks::BankForks;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_runtime::bank::Bank;
     use solana_sdk::{
         pubkey::Pubkey,

core/src/rpc_service.rs

@@ -248,12 +248,11 @@ impl JsonRpcService {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
+    use crate::{contact_info::ContactInfo, rpc::tests::create_validator_exit};
-        contact_info::ContactInfo,
+    use solana_ledger::{
         genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        rpc::tests::create_validator_exit,
+        get_tmp_ledger_path,
     };
-    use solana_ledger::get_tmp_ledger_path;
     use solana_runtime::bank::Bank;
     use solana_sdk::signature::Signer;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};

core/src/rpc_subscriptions.rs

@@ -533,10 +533,10 @@ impl RpcSubscriptions {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use jsonrpc_core::futures::{self, stream::Stream};
     use jsonrpc_pubsub::typed::Subscriber;
     use solana_budget_program;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::{
         signature::{Keypair, Signer},
         system_transaction,

core/src/sigverify_shreds.rs

@@ -72,7 +72,7 @@ impl SigVerifier for ShredSigVerifier {
 #[cfg(test)]
 pub mod tests {
     use super::*;
-    use crate::genesis_utils::create_genesis_config_with_leader;
+    use solana_ledger::genesis_utils::create_genesis_config_with_leader;
     use solana_ledger::shred::{Shred, Shredder};
     use solana_perf::packet::Packet;
     use solana_runtime::bank::Bank;

core/src/storage_stage.rs

@@ -645,8 +645,8 @@ pub fn test_cluster_info(id: &Pubkey) -> Arc<RwLock<ClusterInfo>> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use rayon::prelude::*;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_runtime::bank::Bank;
     use solana_sdk::hash::Hasher;
     use solana_sdk::signature::{Keypair, Signer};

core/src/tvu.rs

@@ -268,8 +268,8 @@ pub mod tests {
     use super::*;
     use crate::banking_stage::create_test_recorder;
     use crate::cluster_info::{ClusterInfo, Node};
-    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::create_new_tmp_ledger;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_runtime::bank::Bank;
     use std::sync::atomic::Ordering;
 

core/src/validator.rs

@@ -669,7 +669,7 @@ pub struct TestValidatorOptions {
 
 impl Default for TestValidatorOptions {
     fn default() -> Self {
-        use crate::genesis_utils::BOOTSTRAP_VALIDATOR_LAMPORTS;
+        use solana_ledger::genesis_utils::BOOTSTRAP_VALIDATOR_LAMPORTS;
         TestValidatorOptions {
             fees: 0,
             bootstrap_validator_lamports: BOOTSTRAP_VALIDATOR_LAMPORTS,
@@ -683,7 +683,9 @@ impl TestValidator {
     }
 
     pub fn run_with_options(options: TestValidatorOptions) -> Self {
-        use crate::genesis_utils::{create_genesis_config_with_leader_ex, GenesisConfigInfo};
+        use solana_ledger::genesis_utils::{
+            create_genesis_config_with_leader_ex, GenesisConfigInfo,
+        };
         use solana_sdk::fee_calculator::FeeRateGovernor;
 
         let TestValidatorOptions {
@@ -803,7 +805,7 @@ fn get_stake_percent_in_gossip(bank: &Arc<Bank>, cluster_info: &Arc<RwLock<Clust
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::genesis_utils::create_genesis_config_with_leader;
+    use solana_ledger::genesis_utils::create_genesis_config_with_leader;
     use std::fs::remove_dir_all;
 
     #[test]

core/src/window_service.rs

@@ -476,14 +476,14 @@ impl WindowService {
 mod test {
     use super::*;
     use crate::{
-        cluster_info::ClusterInfo, contact_info::ContactInfo,
+        cluster_info::ClusterInfo, contact_info::ContactInfo, repair_service::RepairSlotRange,
-        genesis_utils::create_genesis_config_with_leader, repair_service::RepairSlotRange,
     };
     use rand::thread_rng;
     use solana_ledger::shred::DataShredHeader;
     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::Shredder,
     };

core/tests/bank_forks.rs

@@ -7,12 +7,10 @@ mod tests {
     use itertools::Itertools;
     use solana_core::cluster_info::ClusterInfo;
     use solana_core::contact_info::ContactInfo;
-    use solana_core::{
+    use solana_core::snapshot_packager_service::SnapshotPackagerService;
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        snapshot_packager_service::SnapshotPackagerService,
-    };
     use solana_ledger::{
         bank_forks::{BankForks, SnapshotConfig},
+        genesis_utils::{create_genesis_config, GenesisConfigInfo},
         snapshot_utils,
     };
     use solana_runtime::{

core/tests/storage_stage.rs

@@ -3,12 +3,12 @@
 #[cfg(test)]
 mod tests {
     use log::*;
-    use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_core::storage_stage::{test_cluster_info, SLOTS_PER_TURN_TEST};
     use solana_core::storage_stage::{StorageStage, StorageState};
     use solana_ledger::bank_forks::BankForks;
     use solana_ledger::blockstore_processor;
     use solana_ledger::entry;
+    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::{blockstore::Blockstore, create_new_tmp_ledger};
     use solana_runtime::bank::Bank;
     use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;

local-cluster/src/local_cluster.rs

@@ -6,11 +6,13 @@ use solana_client::thin_client::{create_client, ThinClient};
 use solana_core::{
     cluster_info::{Node, VALIDATOR_PORT_RANGE},
     contact_info::ContactInfo,
-    genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
     gossip_service::discover_cluster,
     validator::{Validator, ValidatorConfig},
 };
-use solana_ledger::create_new_tmp_ledger;
+use solana_ledger::{
+    create_new_tmp_ledger,
+    genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
+};
 use solana_sdk::{
     client::SyncClient,
     clock::{DEFAULT_DEV_SLOTS_PER_EPOCH, DEFAULT_SLOTS_PER_SEGMENT, DEFAULT_TICKS_PER_SLOT},