Cleanup ledger macros (solana-labs#6916)

automerge

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;

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;

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;

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;

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};

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

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;

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());

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(

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,
     };

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;

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]

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;

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;

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;

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;
 

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;

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;
 

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},

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};

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;
 

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]

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::{

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;

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;