From 30a08f4282a95c41ea1bdd4260a78b956d251086 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Wed, 13 Nov 2019 08:14:09 -0700 Subject: [PATCH] Cleanup ledger macros (#6916) automerge --- banking-bench/src/main.rs | 6 +- core/benches/banking_stage.rs | 2 +- core/benches/blocktree.rs | 3 +- core/src/banking_stage.rs | 2 +- core/src/blockstream_service.rs | 2 +- core/src/broadcast_stage.rs | 4 +- .../broadcast_stage/standard_broadcast_run.rs | 3 +- core/src/chacha.rs | 5 +- core/src/chacha_cuda.rs | 11 ++-- core/src/cluster_info.rs | 2 +- core/src/cluster_info_repair_listener.rs | 2 +- core/src/ledger_cleanup_service.rs | 2 +- core/src/lib.rs | 3 - core/src/poh_recorder.rs | 2 +- core/src/poh_service.rs | 2 +- core/src/repair_service.rs | 2 +- core/src/replay_stage.rs | 5 +- core/src/retransmit_stage.rs | 2 +- core/src/rpc.rs | 2 +- core/src/rpc_service.rs | 2 +- core/src/tvu.rs | 2 +- core/src/validator.rs | 3 +- core/src/window_service.rs | 3 +- core/tests/storage_stage.rs | 5 +- ledger-tool/tests/basic.rs | 5 +- ledger/src/blocktree.rs | 57 +++++++++---------- ledger/src/blocktree_processor.rs | 1 - ledger/src/leader_schedule_cache.rs | 3 +- ledger/src/rooted_slot_iterator.rs | 2 +- ledger/tests/blocktree.rs | 8 +-- local-cluster/src/lib.rs | 3 - local-cluster/src/local_cluster.rs | 2 +- local-cluster/tests/archiver.rs | 7 +-- 33 files changed, 72 insertions(+), 93 deletions(-) diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs index 6334c9464c..6e0c722e71 100644 --- a/banking-bench/src/main.rs +++ b/banking-bench/src/main.rs @@ -1,7 +1,3 @@ -#[macro_use] -extern crate solana_ledger; -extern crate crossbeam_channel; - use crossbeam_channel::unbounded; use log::*; use rand::{thread_rng, Rng}; @@ -15,7 +11,7 @@ use solana_core::poh_recorder::PohRecorder; use solana_core::poh_recorder::WorkingBankEntry; use solana_core::service::Service; use solana_ledger::bank_forks::BankForks; -use solana_ledger::blocktree::{get_tmp_ledger_path, Blocktree}; +use solana_ledger::{blocktree::Blocktree, get_tmp_ledger_path}; use solana_measure::measure::Measure; use solana_runtime::bank::Bank; use solana_sdk::hash::Hash; diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs index 376b28a220..36f8e6a0ac 100644 --- a/core/benches/banking_stage.rs +++ b/core/benches/banking_stage.rs @@ -15,9 +15,9 @@ use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo}; use solana_core::packet::to_packets_chunked; use solana_core::poh_recorder::WorkingBankEntry; use solana_core::service::Service; -use solana_ledger::blocktree::{get_tmp_ledger_path, Blocktree}; use solana_ledger::blocktree_processor::process_entries; use solana_ledger::entry::{next_hash, Entry}; +use solana_ledger::{blocktree::Blocktree, get_tmp_ledger_path}; use solana_perf::test_tx::test_tx; use solana_runtime::bank::Bank; use solana_sdk::genesis_config::GenesisConfig; diff --git a/core/benches/blocktree.rs b/core/benches/blocktree.rs index 3ca039e5dd..1ee226951d 100644 --- a/core/benches/blocktree.rs +++ b/core/benches/blocktree.rs @@ -8,8 +8,9 @@ extern crate solana_ledger; use rand::Rng; use solana_ledger::{ - blocktree::{entries_to_test_shreds, get_tmp_ledger_path, Blocktree}, + blocktree::{entries_to_test_shreds, Blocktree}, entry::{create_ticks, Entry}, + get_tmp_ledger_path, }; use solana_sdk::{clock::Slot, hash::Hash}; use std::path::Path; diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index 3ff229b94a..d99e850531 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -978,8 +978,8 @@ mod tests { use crate::poh_recorder::WorkingBank; use crossbeam_channel::unbounded; use itertools::Itertools; - use solana_ledger::blocktree::get_tmp_ledger_path; use solana_ledger::entry::{Entry, EntrySlice}; + use solana_ledger::get_tmp_ledger_path; use solana_sdk::instruction::InstructionError; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::system_transaction; diff --git a/core/src/blockstream_service.rs b/core/src/blockstream_service.rs index 72469fb7b6..3e7603ab3c 100644 --- a/core/src/blockstream_service.rs +++ b/core/src/blockstream_service.rs @@ -105,7 +105,7 @@ mod test { use bincode::{deserialize, serialize}; use chrono::{DateTime, FixedOffset}; use serde_json::Value; - use solana_ledger::blocktree::create_new_tmp_ledger; + use solana_ledger::create_new_tmp_ledger; use solana_ledger::entry::{create_ticks, Entry}; use solana_sdk::hash::Hash; use solana_sdk::signature::{Keypair, KeypairUtil}; diff --git a/core/src/broadcast_stage.rs b/core/src/broadcast_stage.rs index 61fe8616cd..cef2c560ec 100644 --- a/core/src/broadcast_stage.rs +++ b/core/src/broadcast_stage.rs @@ -194,8 +194,8 @@ mod test { use crate::cluster_info::{ClusterInfo, Node}; use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo}; use crate::service::Service; - use solana_ledger::blocktree::{get_tmp_ledger_path, Blocktree}; use solana_ledger::entry::create_ticks; + use solana_ledger::{blocktree::Blocktree, get_tmp_ledger_path}; use solana_runtime::bank::Bank; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; @@ -259,7 +259,7 @@ mod test { #[test] fn test_broadcast_ledger() { solana_logger::setup(); - let ledger_path = get_tmp_ledger_path("test_broadcast_ledger"); + let ledger_path = get_tmp_ledger_path!(); { // Create the leader scheduler diff --git a/core/src/broadcast_stage/standard_broadcast_run.rs b/core/src/broadcast_stage/standard_broadcast_run.rs index fc12287d22..86001a1563 100644 --- a/core/src/broadcast_stage/standard_broadcast_run.rs +++ b/core/src/broadcast_stage/standard_broadcast_run.rs @@ -300,8 +300,7 @@ mod test { use crate::cluster_info::{ClusterInfo, Node}; use crate::genesis_utils::create_genesis_config; use solana_ledger::{ - blocktree::{get_tmp_ledger_path, Blocktree}, - entry::create_ticks, + blocktree::Blocktree, entry::create_ticks, get_tmp_ledger_path, shred::max_ticks_per_n_shreds, }; use solana_runtime::bank::Bank; diff --git a/core/src/chacha.rs b/core/src/chacha.rs index dc907ceda0..87ad3c3ee9 100644 --- a/core/src/chacha.rs +++ b/core/src/chacha.rs @@ -75,9 +75,9 @@ pub fn chacha_cbc_encrypt_ledger( mod tests { use crate::chacha::chacha_cbc_encrypt_ledger; use crate::gen_keys::GenKeys; - use solana_ledger::blocktree::get_tmp_ledger_path; use solana_ledger::blocktree::Blocktree; use solana_ledger::entry::Entry; + use solana_ledger::get_tmp_ledger_path; use solana_sdk::hash::{hash, Hash, Hasher}; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::KeypairUtil; @@ -128,8 +128,7 @@ mod tests { #[test] fn test_encrypt_ledger() { solana_logger::setup(); - let ledger_dir = "chacha_test_encrypt_file"; - let ledger_path = get_tmp_ledger_path(ledger_dir); + let ledger_path = get_tmp_ledger_path!(); let ticks_per_slot = 16; let slots_per_segment = 32; let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap()); diff --git a/core/src/chacha_cuda.rs b/core/src/chacha_cuda.rs index beac76b522..9971cdac5b 100644 --- a/core/src/chacha_cuda.rs +++ b/core/src/chacha_cuda.rs @@ -115,8 +115,8 @@ mod tests { use super::*; use crate::archiver::sample_file; use crate::chacha::chacha_cbc_encrypt_ledger; - use solana_ledger::blocktree::get_tmp_ledger_path; use solana_ledger::entry::create_ticks; + use solana_ledger::get_tmp_ledger_path; use solana_sdk::clock::DEFAULT_SLOTS_PER_SEGMENT; use solana_sdk::signature::{Keypair, KeypairUtil}; use std::fs::{remove_dir_all, remove_file}; @@ -132,8 +132,7 @@ mod tests { let slots_per_segment = 32; let entries = create_ticks(slots_per_segment, 0, Hash::default()); - let ledger_dir = "test_encrypt_file_many_keys_single"; - let ledger_path = get_tmp_ledger_path(ledger_dir); + let ledger_path = get_tmp_ledger_path!(); let ticks_per_slot = 16; let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap()); @@ -193,8 +192,7 @@ mod tests { return; } - let ledger_dir = "test_encrypt_file_many_keys_multiple"; - let ledger_path = get_tmp_ledger_path(ledger_dir); + let ledger_path = get_tmp_ledger_path!(); let ticks_per_slot = 90; let entries = create_ticks(2 * ticks_per_slot, 0, Hash::default()); let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap()); @@ -265,8 +263,7 @@ mod tests { } let mut keys = hex!("abc123"); - let ledger_dir = "test_encrypt_file_many_keys_bad_key_length"; - let ledger_path = get_tmp_ledger_path(ledger_dir); + let ledger_path = get_tmp_ledger_path!(); let samples = [0]; let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap()); assert!(chacha_cbc_encrypt_file_many_keys( diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index 65b59eee27..85fc2ffcf2 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -1812,10 +1812,10 @@ mod tests { use crate::repair_service::RepairType; use crate::result::Error; use rayon::prelude::*; - use solana_ledger::blocktree::get_tmp_ledger_path; use solana_ledger::blocktree::make_many_slot_entries; use solana_ledger::blocktree::Blocktree; use solana_ledger::blocktree_processor::fill_blocktree_slot_with_ticks; + use solana_ledger::get_tmp_ledger_path; use solana_ledger::shred::{ max_ticks_per_n_shreds, CodingShredHeader, DataShredHeader, Shred, ShredCommonHeader, }; diff --git a/core/src/cluster_info_repair_listener.rs b/core/src/cluster_info_repair_listener.rs index 8c0c0e9b28..2587aa8cc9 100644 --- a/core/src/cluster_info_repair_listener.rs +++ b/core/src/cluster_info_repair_listener.rs @@ -534,8 +534,8 @@ mod tests { use crate::blob::{Blob, SharedBlob}; use crate::cluster_info::Node; use crate::streamer; - use solana_ledger::blocktree::get_tmp_ledger_path; use solana_ledger::blocktree::make_many_slot_entries; + use solana_ledger::get_tmp_ledger_path; use std::collections::BTreeSet; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::channel; diff --git a/core/src/ledger_cleanup_service.rs b/core/src/ledger_cleanup_service.rs index 418762725b..efb885e9a1 100644 --- a/core/src/ledger_cleanup_service.rs +++ b/core/src/ledger_cleanup_service.rs @@ -75,8 +75,8 @@ impl Service for LedgerCleanupService { #[cfg(test)] mod tests { use super::*; - use solana_ledger::blocktree::get_tmp_ledger_path; use solana_ledger::blocktree::make_many_slot_entries; + use solana_ledger::get_tmp_ledger_path; use std::sync::mpsc::channel; #[test] diff --git a/core/src/lib.rs b/core/src/lib.rs index 4b5d70494c..31d7d51412 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -101,6 +101,3 @@ extern crate solana_metrics; #[cfg(test)] #[macro_use] extern crate matches; - -#[macro_use] -extern crate solana_ledger; diff --git a/core/src/poh_recorder.rs b/core/src/poh_recorder.rs index d7ace6f963..31c2ec24b2 100644 --- a/core/src/poh_recorder.rs +++ b/core/src/poh_recorder.rs @@ -469,7 +469,7 @@ impl PohRecorder { mod tests { use super::*; use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo}; - use solana_ledger::blocktree::{get_tmp_ledger_path, Blocktree}; + use solana_ledger::{blocktree::Blocktree, get_tmp_ledger_path}; use solana_perf::test_tx::test_tx; use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT; use solana_sdk::hash::hash; diff --git a/core/src/poh_service.rs b/core/src/poh_service.rs index 9b831cfbae..815551157a 100644 --- a/core/src/poh_service.rs +++ b/core/src/poh_service.rs @@ -112,8 +112,8 @@ mod tests { use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo}; use crate::poh_recorder::WorkingBank; use crate::result::Result; - use solana_ledger::blocktree::{get_tmp_ledger_path, Blocktree}; use solana_ledger::leader_schedule_cache::LeaderScheduleCache; + use solana_ledger::{blocktree::Blocktree, get_tmp_ledger_path}; use solana_perf::test_tx::test_tx; use solana_runtime::bank::Bank; use solana_sdk::hash::hash; diff --git a/core/src/repair_service.rs b/core/src/repair_service.rs index 0d1936c7a8..ae0051c85f 100644 --- a/core/src/repair_service.rs +++ b/core/src/repair_service.rs @@ -397,11 +397,11 @@ mod test { use itertools::Itertools; use rand::seq::SliceRandom; use rand::{thread_rng, Rng}; - use solana_ledger::blocktree::{get_tmp_ledger_path, Blocktree}; use solana_ledger::blocktree::{ make_chaining_slot_entries, make_many_slot_entries, make_slot_entries, }; use solana_ledger::shred::max_ticks_per_n_shreds; + use solana_ledger::{blocktree::Blocktree, get_tmp_ledger_path}; use std::sync::mpsc::channel; use std::thread::Builder; diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index 546729f295..fee4dbb487 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -943,12 +943,15 @@ mod test { use crate::genesis_utils::{create_genesis_config, create_genesis_config_with_leader}; use crate::replay_stage::ReplayStage; use solana_ledger::blocktree::make_slot_entries; - use solana_ledger::blocktree::{entries_to_test_shreds, get_tmp_ledger_path, BlocktreeError}; use solana_ledger::entry; use solana_ledger::shred::{ CodingShredHeader, DataShredHeader, Shred, ShredCommonHeader, DATA_COMPLETE_SHRED, SIZE_OF_COMMON_SHRED_HEADER, SIZE_OF_DATA_SHRED_HEADER, SIZE_OF_DATA_SHRED_PAYLOAD, }; + use solana_ledger::{ + blocktree::{entries_to_test_shreds, BlocktreeError}, + get_tmp_ledger_path, + }; use solana_runtime::genesis_utils::GenesisConfigInfo; use solana_sdk::hash::{hash, Hash}; use solana_sdk::packet::PACKET_DATA_SIZE; diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs index 939c6e9b31..4134528eec 100644 --- a/core/src/retransmit_stage.rs +++ b/core/src/retransmit_stage.rs @@ -276,8 +276,8 @@ mod tests { use crate::contact_info::ContactInfo; use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo}; use crate::packet::{self, Meta, Packet, Packets}; - use solana_ledger::blocktree::create_new_tmp_ledger; use solana_ledger::blocktree_processor::{process_blocktree, ProcessOptions}; + use solana_ledger::create_new_tmp_ledger; use solana_net_utils::find_available_port_in_range; use solana_sdk::pubkey::Pubkey; diff --git a/core/src/rpc.rs b/core/src/rpc.rs index ebe5b08210..2a04a31da5 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -1030,7 +1030,7 @@ pub mod tests { genesis_utils::{create_genesis_config, GenesisConfigInfo}, }; use jsonrpc_core::{MetaIoHandler, Output, Response, Value}; - use solana_ledger::blocktree::get_tmp_ledger_path; + use solana_ledger::get_tmp_ledger_path; use solana_sdk::{ fee_calculator::DEFAULT_BURN_PERCENT, hash::{hash, Hash}, diff --git a/core/src/rpc_service.rs b/core/src/rpc_service.rs index d26c76f714..c236ef4308 100644 --- a/core/src/rpc_service.rs +++ b/core/src/rpc_service.rs @@ -181,7 +181,7 @@ mod tests { genesis_utils::{create_genesis_config, GenesisConfigInfo}, rpc::tests::create_validator_exit, }; - use solana_ledger::blocktree::get_tmp_ledger_path; + use solana_ledger::get_tmp_ledger_path; use solana_runtime::bank::Bank; use solana_sdk::signature::KeypairUtil; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; diff --git a/core/src/tvu.rs b/core/src/tvu.rs index ee1f804aee..0306588c13 100644 --- a/core/src/tvu.rs +++ b/core/src/tvu.rs @@ -236,7 +236,7 @@ pub mod tests { use crate::banking_stage::create_test_recorder; use crate::cluster_info::{ClusterInfo, Node}; use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo}; - use solana_ledger::blocktree::create_new_tmp_ledger; + use solana_ledger::create_new_tmp_ledger; use solana_runtime::bank::Bank; use std::sync::atomic::Ordering; diff --git a/core/src/validator.rs b/core/src/validator.rs index db6e2fe72a..32a2f8ab02 100644 --- a/core/src/validator.rs +++ b/core/src/validator.rs @@ -23,6 +23,7 @@ use solana_ledger::{ bank_forks_utils, blocktree::{Blocktree, CompletedSlotsReceiver}, blocktree_processor::{self, BankForksInfo}, + create_new_tmp_ledger, leader_schedule_cache::LeaderScheduleCache, }; use solana_metrics::datapoint_info; @@ -503,7 +504,6 @@ impl Service for Validator { pub fn new_validator_for_tests() -> (Validator, ContactInfo, Keypair, PathBuf) { use crate::genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo}; - use solana_ledger::blocktree::create_new_tmp_ledger; let node_keypair = Arc::new(Keypair::new()); let node = Node::new_localhost_with_pubkey(&node_keypair.pubkey()); @@ -544,7 +544,6 @@ pub fn new_validator_for_tests() -> (Validator, ContactInfo, Keypair, PathBuf) { mod tests { use super::*; use crate::genesis_utils::create_genesis_config_with_leader; - use solana_ledger::blocktree::create_new_tmp_ledger; use std::fs::remove_dir_all; #[test] diff --git a/core/src/window_service.rs b/core/src/window_service.rs index 0f6131f0c5..5b5d03d392 100644 --- a/core/src/window_service.rs +++ b/core/src/window_service.rs @@ -288,8 +288,9 @@ mod test { use rand::thread_rng; use solana_ledger::shred::DataShredHeader; use solana_ledger::{ - blocktree::{get_tmp_ledger_path, make_many_slot_entries, Blocktree}, + blocktree::{make_many_slot_entries, Blocktree}, entry::{create_ticks, Entry}, + get_tmp_ledger_path, shred::Shredder, }; use solana_sdk::{ diff --git a/core/tests/storage_stage.rs b/core/tests/storage_stage.rs index b8f2f3e4c8..dac7708b41 100644 --- a/core/tests/storage_stage.rs +++ b/core/tests/storage_stage.rs @@ -1,8 +1,5 @@ // Long-running storage_stage tests -#[macro_use] -extern crate solana_ledger; - #[cfg(test)] mod tests { use log::*; @@ -11,9 +8,9 @@ mod tests { 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::blocktree::{create_new_tmp_ledger, Blocktree}; use solana_ledger::blocktree_processor; use solana_ledger::entry; + use solana_ledger::{blocktree::Blocktree, create_new_tmp_ledger}; use solana_runtime::bank::Bank; use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT; use solana_sdk::hash::Hash; diff --git a/ledger-tool/tests/basic.rs b/ledger-tool/tests/basic.rs index 68e1db9dc9..d4a34cbe93 100644 --- a/ledger-tool/tests/basic.rs +++ b/ledger-tool/tests/basic.rs @@ -1,8 +1,5 @@ -#[macro_use] -extern crate solana_ledger; - use assert_cmd::prelude::*; -use solana_ledger::blocktree::create_new_tmp_ledger; +use solana_ledger::create_new_tmp_ledger; use solana_ledger::genesis_utils::create_genesis_config; use std::process::Command; use std::process::Output; diff --git a/ledger/src/blocktree.rs b/ledger/src/blocktree.rs index 11fae6ce1d..46baa46fd2 100644 --- a/ledger/src/blocktree.rs +++ b/ledger/src/blocktree.rs @@ -1776,11 +1776,11 @@ macro_rules! tmp_ledger_name { #[macro_export] macro_rules! get_tmp_ledger_path { () => { - get_tmp_ledger_path(tmp_ledger_name!()) + $crate::blocktree::get_ledger_path_from_name($crate::tmp_ledger_name!()) }; } -pub fn get_tmp_ledger_path(name: &str) -> PathBuf { +pub fn get_ledger_path_from_name(name: &str) -> PathBuf { use std::env; let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string()); let keypair = Keypair::new(); @@ -1802,7 +1802,7 @@ pub fn get_tmp_ledger_path(name: &str) -> PathBuf { #[macro_export] macro_rules! create_new_tmp_ledger { ($genesis_config:expr) => { - create_new_tmp_ledger(tmp_ledger_name!(), $genesis_config) + $crate::blocktree::create_new_ledger_from_name($crate::tmp_ledger_name!(), $genesis_config) }; } @@ -1828,8 +1828,8 @@ pub fn verify_shred_slots(slot: Slot, parent_slot: Slot, last_root: u64) -> bool // // Note: like `create_new_ledger` the returned ledger will have slot 0 full of ticks (and only // ticks) -pub fn create_new_tmp_ledger(name: &str, genesis_config: &GenesisConfig) -> (PathBuf, Hash) { - let ledger_path = get_tmp_ledger_path(name); +pub fn create_new_ledger_from_name(name: &str, genesis_config: &GenesisConfig) -> (PathBuf, Hash) { + let ledger_path = get_ledger_path_from_name(name); let blockhash = create_new_ledger(&ledger_path, genesis_config).unwrap(); (ledger_path, blockhash) } @@ -1976,7 +1976,7 @@ pub mod tests { let (mut shreds, _) = make_slot_entries(0, 0, num_entries); - let ledger_path = get_tmp_ledger_path("test_insert_data_shreds_basic"); + let ledger_path = get_tmp_ledger_path!(); let ledger = Blocktree::open(&ledger_path).unwrap(); // Insert last shred, test we can retrieve it @@ -2099,7 +2099,7 @@ pub mod tests { #[test] fn test_put_get_simple() { - let ledger_path = get_tmp_ledger_path("test_put_get_simple"); + let ledger_path = get_tmp_ledger_path!(); let ledger = Blocktree::open(&ledger_path).unwrap(); // Test meta column family @@ -2154,7 +2154,7 @@ pub mod tests { let num_shreds = shreds.len() as u64; let shred_bufs: Vec<_> = shreds.iter().map(|shred| shred.payload.clone()).collect(); - let ledger_path = get_tmp_ledger_path("test_read_shreds_bytes"); + let ledger_path = get_tmp_ledger_path!(); let ledger = Blocktree::open(&ledger_path).unwrap(); ledger.insert_shreds(shreds, None).unwrap(); @@ -2216,7 +2216,7 @@ pub mod tests { let (mut shreds, entries) = make_slot_entries(0, 0, num_entries); let num_shreds = shreds.len() as u64; - let ledger_path = get_tmp_ledger_path("test_insert_data_shreds_basic"); + let ledger_path = get_tmp_ledger_path!(); let ledger = Blocktree::open(&ledger_path).unwrap(); // Insert last shred, we're missing the other shreds, so no consecutive @@ -2261,7 +2261,7 @@ pub mod tests { let (mut shreds, entries) = make_slot_entries(0, 0, num_entries); let num_shreds = shreds.len() as u64; - let ledger_path = get_tmp_ledger_path("test_insert_data_shreds_reverse"); + let ledger_path = get_tmp_ledger_path!(); let ledger = Blocktree::open(&ledger_path).unwrap(); // Insert shreds in reverse, check for consecutive returned shreds @@ -2300,7 +2300,7 @@ pub mod tests { #[test] pub fn test_iteration_order() { let slot = 0; - let blocktree_path = get_tmp_ledger_path("test_iteration_order"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); @@ -2339,7 +2339,7 @@ pub mod tests { #[test] pub fn test_get_slot_entries1() { - let blocktree_path = get_tmp_ledger_path("test_get_slot_entries1"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); let entries = create_ticks(8, 0, Hash::default()); @@ -2369,7 +2369,7 @@ pub mod tests { #[test] #[ignore] pub fn test_get_slot_entries2() { - let blocktree_path = get_tmp_ledger_path("test_get_slot_entries2"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); @@ -2403,7 +2403,7 @@ pub mod tests { #[test] pub fn test_get_slot_entries3() { // Test inserting/fetching shreds which contain multiple entries per shred - let blocktree_path = get_tmp_ledger_path("test_get_slot_entries3"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); let num_slots = 5 as u64; @@ -2430,7 +2430,7 @@ pub mod tests { #[test] pub fn test_insert_data_shreds_consecutive() { - let blocktree_path = get_tmp_ledger_path("test_insert_data_shreds_consecutive"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); // Create enough entries to ensure there are at least two shreds created @@ -2494,7 +2494,7 @@ pub mod tests { #[test] pub fn test_insert_data_shreds_duplicate() { // Create RocksDb ledger - let blocktree_path = get_tmp_ledger_path("test_insert_data_shreds_duplicate"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); @@ -2531,7 +2531,7 @@ pub mod tests { #[test] pub fn test_new_shreds_signal() { // Initialize ledger - let ledger_path = get_tmp_ledger_path("test_new_shreds_signal"); + let ledger_path = get_tmp_ledger_path!(); let (ledger, recvr, _) = Blocktree::open_with_signal(&ledger_path).unwrap(); let ledger = Arc::new(ledger); @@ -2607,7 +2607,7 @@ pub mod tests { #[test] pub fn test_completed_shreds_signal() { // Initialize ledger - let ledger_path = get_tmp_ledger_path("test_completed_shreds_signal"); + let ledger_path = get_tmp_ledger_path!(); let (ledger, _, recvr) = Blocktree::open_with_signal(&ledger_path).unwrap(); let ledger = Arc::new(ledger); @@ -2629,7 +2629,7 @@ pub mod tests { #[test] pub fn test_completed_shreds_signal_orphans() { // Initialize ledger - let ledger_path = get_tmp_ledger_path("test_completed_shreds_signal_orphans"); + let ledger_path = get_tmp_ledger_path!(); let (ledger, _, recvr) = Blocktree::open_with_signal(&ledger_path).unwrap(); let ledger = Arc::new(ledger); @@ -2665,7 +2665,7 @@ pub mod tests { #[test] pub fn test_completed_shreds_signal_many() { // Initialize ledger - let ledger_path = get_tmp_ledger_path("test_completed_shreds_signal_many"); + let ledger_path = get_tmp_ledger_path!(); let (ledger, _, recvr) = Blocktree::open_with_signal(&ledger_path).unwrap(); let ledger = Arc::new(ledger); @@ -2695,7 +2695,7 @@ pub mod tests { #[test] pub fn test_handle_chaining_basic() { - let blocktree_path = get_tmp_ledger_path("test_handle_chaining_basic"); + let blocktree_path = get_tmp_ledger_path!(); { let entries_per_slot = 5; let num_slots = 3; @@ -2760,7 +2760,7 @@ pub mod tests { #[test] pub fn test_handle_chaining_missing_slots() { - let blocktree_path = get_tmp_ledger_path("test_handle_chaining_missing_slots"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); let num_slots = 30; @@ -2842,7 +2842,7 @@ pub mod tests { #[test] pub fn test_forward_chaining_is_connected() { - let blocktree_path = get_tmp_ledger_path("test_forward_chaining_is_connected"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); let num_slots = 15; @@ -2929,7 +2929,7 @@ pub mod tests { /* #[test] pub fn test_chaining_tree() { - let blocktree_path = get_tmp_ledger_path("test_chaining_tree"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); let num_tree_levels = 6; @@ -3030,7 +3030,7 @@ pub mod tests { */ #[test] pub fn test_get_slots_since() { - let blocktree_path = get_tmp_ledger_path("test_get_slots_since"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); @@ -3067,7 +3067,7 @@ pub mod tests { #[test] fn test_orphans() { - let blocktree_path = get_tmp_ledger_path("test_orphans"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); @@ -3127,7 +3127,7 @@ pub mod tests { } fn test_insert_data_shreds_slots(name: &str, should_bulk_write: bool) { - let blocktree_path = get_tmp_ledger_path(name); + let blocktree_path = get_ledger_path_from_name(name); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); @@ -3871,8 +3871,7 @@ pub mod tests { #[test] fn test_get_slot_entries_with_shred_count_corruption() { - let blocktree_path = - get_tmp_ledger_path("test_get_slot_entries_with_shred_count_corruption"); + let blocktree_path = get_tmp_ledger_path!(); { let blocktree = Blocktree::open(&blocktree_path).unwrap(); let num_ticks = 8; diff --git a/ledger/src/blocktree_processor.rs b/ledger/src/blocktree_processor.rs index 3340fcef60..494229235a 100644 --- a/ledger/src/blocktree_processor.rs +++ b/ledger/src/blocktree_processor.rs @@ -542,7 +542,6 @@ pub fn fill_blocktree_slot_with_ticks( #[cfg(test)] pub mod tests { use super::*; - use crate::blocktree::create_new_tmp_ledger; use crate::entry::{create_ticks, next_entry, next_entry_mut}; use crate::genesis_utils::{ create_genesis_config, create_genesis_config_with_leader, GenesisConfigInfo, diff --git a/ledger/src/leader_schedule_cache.rs b/ledger/src/leader_schedule_cache.rs index 80df8e18bc..3bd5f85a11 100644 --- a/ledger/src/leader_schedule_cache.rs +++ b/ledger/src/leader_schedule_cache.rs @@ -235,11 +235,12 @@ impl LeaderScheduleCache { mod tests { use super::*; use crate::{ - blocktree::{get_tmp_ledger_path, make_slot_entries}, + blocktree::make_slot_entries, genesis_utils::{ create_genesis_config, create_genesis_config_with_leader, GenesisConfigInfo, BOOTSTRAP_LEADER_LAMPORTS, }, + get_tmp_ledger_path, staking_utils::tests::setup_vote_and_stake_accounts, }; use solana_runtime::bank::Bank; diff --git a/ledger/src/rooted_slot_iterator.rs b/ledger/src/rooted_slot_iterator.rs index ed95a1adc0..3feb01c8e7 100644 --- a/ledger/src/rooted_slot_iterator.rs +++ b/ledger/src/rooted_slot_iterator.rs @@ -59,7 +59,7 @@ mod tests { #[test] fn test_rooted_slot_iterator() { - let blocktree_path = get_tmp_ledger_path("test_rooted_slot_iterator"); + let blocktree_path = get_tmp_ledger_path!(); let blocktree = Blocktree::open(&blocktree_path).unwrap(); blocktree.set_roots(&[0]).unwrap(); let ticks_per_slot = 5; diff --git a/ledger/tests/blocktree.rs b/ledger/tests/blocktree.rs index b996a22add..724dbd4c61 100644 --- a/ledger/tests/blocktree.rs +++ b/ledger/tests/blocktree.rs @@ -1,8 +1,8 @@ -#[macro_use] -extern crate solana_ledger; - -use solana_ledger::blocktree::{self, get_tmp_ledger_path, Blocktree}; use solana_ledger::entry; +use solana_ledger::{ + blocktree::{self, Blocktree}, + get_tmp_ledger_path, +}; use solana_sdk::hash::Hash; use std::sync::Arc; use std::thread::Builder; diff --git a/local-cluster/src/lib.rs b/local-cluster/src/lib.rs index 7979be7066..b6d76272ad 100644 --- a/local-cluster/src/lib.rs +++ b/local-cluster/src/lib.rs @@ -2,8 +2,5 @@ pub mod cluster; pub mod cluster_tests; pub mod local_cluster; -#[macro_use] -extern crate solana_ledger; - #[macro_use] extern crate solana_storage_program; diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs index 04c3480105..83876a6a74 100644 --- a/local-cluster/src/local_cluster.rs +++ b/local-cluster/src/local_cluster.rs @@ -10,7 +10,7 @@ use solana_core::{ service::Service, validator::{Validator, ValidatorConfig}, }; -use solana_ledger::blocktree::create_new_tmp_ledger; +use solana_ledger::create_new_tmp_ledger; use solana_sdk::{ client::SyncClient, clock::{DEFAULT_SLOTS_PER_EPOCH, DEFAULT_SLOTS_PER_SEGMENT, DEFAULT_TICKS_PER_SLOT}, diff --git a/local-cluster/tests/archiver.rs b/local-cluster/tests/archiver.rs index 5bf13f66e8..930b301861 100644 --- a/local-cluster/tests/archiver.rs +++ b/local-cluster/tests/archiver.rs @@ -1,6 +1,3 @@ -#[macro_use] -extern crate solana_ledger; - use log::*; use serial_test_derive::serial; use solana_client::thin_client::create_client; @@ -12,7 +9,7 @@ use solana_core::{ storage_stage::SLOTS_PER_TURN_TEST, validator::ValidatorConfig, }; -use solana_ledger::blocktree::{create_new_tmp_ledger, get_tmp_ledger_path, Blocktree}; +use solana_ledger::{blocktree::Blocktree, create_new_tmp_ledger, get_tmp_ledger_path}; use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster}; use solana_sdk::{ commitment_config::CommitmentConfig, @@ -64,7 +61,7 @@ fn run_archiver_startup_basic(num_nodes: usize, num_archivers: usize) { let cluster_info = Arc::new(RwLock::new(ClusterInfo::new_with_invalid_keypair( cluster_nodes[0].clone(), ))); - let path = get_tmp_ledger_path("test"); + let path = get_tmp_ledger_path!(); let blocktree = Arc::new(Blocktree::open(&path).unwrap()); Archiver::download_from_archiver(&cluster_info, &archiver_info, &blocktree, slots_per_segment) .unwrap();