gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup ledger macros (#6916)

Browse Source 
automerge
This commit is contained in:
Greg Fitzgerald
2019-11-13 08:14:09 -07:00
committed by Grimes
parent e5c5f34f9a
commit 30a08f4282
33 changed files with 72 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
local-cluster/tests/archiver.rs
View File

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