diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs index d8b777fdb8..a9b97c08e6 100644 --- a/banking-bench/src/main.rs +++ b/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::cluster_info::ClusterInfo; -use solana_core::cluster_info::Node; -use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo}; -use solana_core::poh_recorder::PohRecorder; -use solana_core::poh_recorder::WorkingBankEntry; -use solana_ledger::bank_forks::BankForks; -use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path}; +use solana_core::{ + banking_stage::{create_test_recorder, BankingStage}, + cluster_info::ClusterInfo, + cluster_info::Node, + poh_recorder::PohRecorder, + poh_recorder::WorkingBankEntry, +}; +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::pubkey::Pubkey; -use solana_sdk::signature::Keypair; -use solana_sdk::signature::Signature; -use solana_sdk::system_transaction; -use solana_sdk::timing::{duration_as_us, timestamp}; -use solana_sdk::transaction::Transaction; -use std::sync::atomic::Ordering; -use std::sync::mpsc::Receiver; -use std::sync::{Arc, Mutex, RwLock}; -use std::thread::sleep; -use std::time::{Duration, Instant}; +use solana_sdk::{ + hash::Hash, + pubkey::Pubkey, + signature::Keypair, + signature::Signature, + system_transaction, + timing::{duration_as_us, timestamp}, + transaction::Transaction, +}; +use std::{ + sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex, RwLock}, + thread::sleep, + time::{Duration, Instant}, +}; fn check_txs( receiver: &Arc>, diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs index e4ae27df96..c8f3a04278 100644 --- a/core/benches/banking_stage.rs +++ b/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; diff --git a/core/benches/retransmit_stage.rs b/core/benches/retransmit_stage.rs index 14f034da41..ae3280fd62 100644 --- a/core/benches/retransmit_stage.rs +++ b/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; diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index bd93423ad4..1fd7a2255c 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -1012,9 +1012,7 @@ pub fn create_test_recorder( mod tests { use super::*; use crate::{ - cluster_info::Node, - genesis_utils::{create_genesis_config, GenesisConfigInfo}, - poh_recorder::WorkingBank, + cluster_info::Node, 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; diff --git a/core/src/blockstream_service.rs b/core/src/blockstream_service.rs index 76ef0a2a4a..e56230e507 100644 --- a/core/src/blockstream_service.rs +++ b/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; diff --git a/core/src/broadcast_stage.rs b/core/src/broadcast_stage.rs index dc9752863b..cd860a09c8 100644 --- a/core/src/broadcast_stage.rs +++ b/core/src/broadcast_stage.rs @@ -331,14 +331,12 @@ impl BroadcastStage { #[cfg(test)] pub mod test { use super::*; - use crate::{ - cluster_info::{ClusterInfo, Node}, - genesis_utils::{create_genesis_config, GenesisConfigInfo}, - }; + use crate::cluster_info::{ClusterInfo, Node}; 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}, }; diff --git a/core/src/broadcast_stage/broadcast_utils.rs b/core/src/broadcast_stage/broadcast_utils.rs index 6d1e68bf18..35dd4c1127 100644 --- a/core/src/broadcast_stage/broadcast_utils.rs +++ b/core/src/broadcast_stage/broadcast_utils.rs @@ -76,7 +76,7 @@ pub(super) fn recv_slot_entries(receiver: &Receiver) -> 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; diff --git a/core/src/broadcast_stage/standard_broadcast_run.rs b/core/src/broadcast_stage/standard_broadcast_run.rs index 2f25c09223..8f82a4d0ce 100644 --- a/core/src/broadcast_stage/standard_broadcast_run.rs +++ b/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, diff --git a/core/src/commitment.rs b/core/src/commitment.rs index a7df5e328f..c73b95ee80 100644 --- a/core/src/commitment.rs +++ b/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}; diff --git a/core/src/genesis_utils.rs b/core/src/genesis_utils.rs deleted file mode 100644 index 2aae34143b..0000000000 --- a/core/src/genesis_utils.rs +++ /dev/null @@ -1 +0,0 @@ -pub use solana_ledger::genesis_utils::*; diff --git a/core/src/lib.rs b/core/src/lib.rs index b5cdf468d8..23699199db 100644 --- a/core/src/lib.rs +++ b/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; diff --git a/core/src/poh_recorder.rs b/core/src/poh_recorder.rs index a4ed6001e2..06e3993ed0 100644 --- a/core/src/poh_recorder.rs +++ b/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; diff --git a/core/src/poh_service.rs b/core/src/poh_service.rs index 14f6418aec..8e516585a1 100644 --- a/core/src/poh_service.rs +++ b/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; diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index c2a85dac49..b80ce3412a 100644 --- a/core/src/replay_stage.rs +++ b/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, diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs index 794572a8c9..590d0012a6 100644 --- a/core/src/retransmit_stage.rs +++ b/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; diff --git a/core/src/rpc.rs b/core/src/rpc.rs index 9ae6039cf1..e433de03a7 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -1182,17 +1182,18 @@ impl RpcSol for RpcSolImpl { pub mod tests { use super::*; use crate::{ - commitment::BlockCommitment, - contact_info::ContactInfo, - genesis_utils::{create_genesis_config, GenesisConfigInfo}, + commitment::BlockCommitment, contact_info::ContactInfo, 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, - entry::next_entry_mut, get_tmp_ledger_path, + blockstore::entries_to_test_shreds, + 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, diff --git a/core/src/rpc_pubsub.rs b/core/src/rpc_pubsub.rs index 0288b3e074..e5d15e82ed 100644 --- a/core/src/rpc_pubsub.rs +++ b/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, diff --git a/core/src/rpc_service.rs b/core/src/rpc_service.rs index 9e7fecaa24..839e9e781e 100644 --- a/core/src/rpc_service.rs +++ b/core/src/rpc_service.rs @@ -248,12 +248,11 @@ impl JsonRpcService { #[cfg(test)] mod tests { use super::*; - use crate::{ - contact_info::ContactInfo, + use crate::{contact_info::ContactInfo, rpc::tests::create_validator_exit}; + 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}; diff --git a/core/src/rpc_subscriptions.rs b/core/src/rpc_subscriptions.rs index 1051173fc3..6019812c32 100644 --- a/core/src/rpc_subscriptions.rs +++ b/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, diff --git a/core/src/sigverify_shreds.rs b/core/src/sigverify_shreds.rs index c939e9b4f4..bea9ca3b09 100644 --- a/core/src/sigverify_shreds.rs +++ b/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; diff --git a/core/src/storage_stage.rs b/core/src/storage_stage.rs index 2a3ad88ac3..a482099744 100644 --- a/core/src/storage_stage.rs +++ b/core/src/storage_stage.rs @@ -645,8 +645,8 @@ pub fn test_cluster_info(id: &Pubkey) -> Arc> { #[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}; diff --git a/core/src/tvu.rs b/core/src/tvu.rs index 3436128ce4..b466ac1922 100644 --- a/core/src/tvu.rs +++ b/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; diff --git a/core/src/validator.rs b/core/src/validator.rs index 300c4aa3a6..992971b2c8 100644 --- a/core/src/validator.rs +++ b/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, cluster_info: &Arc