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

Move src/logger.rs into logger/ crate to unify logging across the workspace

Browse Source
This commit is contained in:
Michael Vines
2018-12-14 12:36:50 -08:00
committed by Grimes
parent d45fcc4381
commit 6ac466c0a4
55 changed files with 158 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/data_replicator.rs
View File

@@ -4,7 +4,7 @@ extern crate log;
use rayon::iter::*;
use solana::cluster_info::{ClusterInfo, Node};
use solana::gossip_service::GossipService;
use solana::logger;
use solana::packet::{Blob, SharedBlob};
use solana::result;
use solana::service::Service;
@@ -61,7 +61,7 @@ where
/// ring a -> b -> c -> d -> e -> a
#[test]
fn gossip_ring() -> result::Result<()> {
logger::setup();
solana_logger::setup();
run_gossip_topo(50, |listen| {
let num = listen.len();
for n in 0..num {
@@ -82,7 +82,7 @@ fn gossip_ring() -> result::Result<()> {
#[test]
#[ignore]
fn gossip_ring_large() -> result::Result<()> {
logger::setup();
solana_logger::setup();
run_gossip_topo(600, |listen| {
let num = listen.len();
for n in 0..num {
@@ -101,7 +101,7 @@ fn gossip_ring_large() -> result::Result<()> {
/// star a -> (b,c,d,e)
#[test]
fn gossip_star() {
logger::setup();
solana_logger::setup();
run_gossip_topo(50, |listen| {
let num = listen.len();
for n in 0..(num - 1) {
@@ -120,7 +120,7 @@ fn gossip_star() {
/// rstar a <- (b,c,d,e)
#[test]
fn gossip_rstar() {
logger::setup();
solana_logger::setup();
run_gossip_topo(50, |listen| {
let num = listen.len();
let xd = {
@@ -139,7 +139,7 @@ fn gossip_rstar() {
#[test]
pub fn cluster_info_retransmit() -> result::Result<()> {
logger::setup();
solana_logger::setup();
let exit = Arc::new(AtomicBool::new(false));
trace!("c1:");
let (c1, dr1, tn1) = test_node(exit.clone());

3
tests/fork-selection.rs
View File

@@ -248,7 +248,8 @@ impl LockTower {
// hard coded to 100 nodes
assert!(v <= 100);
v > 50
}).unwrap_or(true)
})
.unwrap_or(true)
}
pub fn score(&self, vote: &Vote, fork_tree: &HashMap<usize, Fork>) -> usize {
let st = self.rollback_count(vote.time);

30
tests/multinode.rs
View File

@@ -15,7 +15,7 @@ use solana::ledger::{
create_tmp_genesis, create_tmp_sample_ledger, read_ledger, tmp_copy_ledger, LedgerWindow,
LedgerWriter,
};
use solana::logger;
use solana::mint::Mint;
use solana::packet::SharedBlob;
use solana::poh_service::NUM_TICKS_PER_SECOND;
@@ -116,7 +116,7 @@ fn make_tiny_test_entries(start_hash: Hash, num: usize) -> Vec<Entry> {
#[test]
fn test_multi_node_ledger_window() -> result::Result<()> {
logger::setup();
solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new());
let leader_pubkey = leader_keypair.pubkey().clone();
@@ -212,7 +212,7 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
#[test]
#[ignore]
fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
logger::setup();
solana_logger::setup();
const N: usize = 5;
trace!("test_multi_node_validator_catchup_from_zero");
let leader_keypair = Arc::new(Keypair::new());
@@ -358,7 +358,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
#[test]
#[ignore]
fn test_multi_node_basic() {
logger::setup();
solana_logger::setup();
const N: usize = 5;
trace!("test_multi_node_basic");
let leader_keypair = Arc::new(Keypair::new());
@@ -439,7 +439,7 @@ fn test_multi_node_basic() {
#[test]
#[ignore]
fn test_boot_validator_from_file() -> result::Result<()> {
logger::setup();
solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new());
let leader_pubkey = leader_keypair.pubkey();
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
@@ -517,7 +517,7 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
// this test verifies that a freshly started leader makes his ledger available
// in the repair window to validators that are started with an older
// ledger (currently up to WINDOW_SIZE entries)
logger::setup();
solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new());
let initial_leader_balance = 500;
@@ -604,7 +604,7 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
#[test]
#[ignore]
fn test_multi_node_dynamic_network() {
logger::setup();
solana_logger::setup();
assert!(cfg!(feature = "test"));
let key = "SOLANA_DYNAMIC_NODES";
let num_nodes: usize = match env::var(key) {
@@ -801,7 +801,7 @@ fn test_multi_node_dynamic_network() {
#[test]
fn test_leader_to_validator_transition() {
logger::setup();
solana_logger::setup();
let leader_rotation_interval = 20;
// Make a dummy validator id to be the next leader
@@ -929,7 +929,7 @@ fn test_leader_to_validator_transition() {
#[test]
fn test_leader_validator_basic() {
logger::setup();
solana_logger::setup();
let leader_rotation_interval = 10;
// Account that will be the sink for all the test's transactions
@@ -1109,11 +1109,11 @@ fn run_node(
#[test]
#[ignore]
fn test_dropped_handoff_recovery() {
logger::setup();
solana_logger::setup();
// The number of validators
const N: usize = 3;
assert!(N > 1);
logger::setup();
solana_logger::setup();
// Create the bootstrap leader node information
let bootstrap_leader_keypair = Arc::new(Keypair::new());
@@ -1257,10 +1257,10 @@ fn test_dropped_handoff_recovery() {
#[ignore]
//TODO: Ignore for now due to bug exposed by the test "test_dropped_handoff_recovery"
fn test_full_leader_validator_network() {
logger::setup();
solana_logger::setup();
// The number of validators
const N: usize = 5;
logger::setup();
solana_logger::setup();
// Create the bootstrap leader node information
let bootstrap_leader_keypair = Keypair::new();
@@ -1509,10 +1509,10 @@ fn test_full_leader_validator_network() {
#[test]
fn test_broadcast_last_tick() {
logger::setup();
solana_logger::setup();
// The number of validators
const N: usize = 5;
logger::setup();
solana_logger::setup();
// Create the bootstrap leader node information
let bootstrap_leader_keypair = Keypair::new();

10
tests/programs.rs
View File

@@ -2,7 +2,7 @@ use solana;
use solana_native_loader;
use solana::bank::Bank;
use solana::logger;
use solana::mint::Mint;
#[cfg(feature = "bpf_c")]
use solana_sdk::bpf_loader;
@@ -177,7 +177,7 @@ impl Program {
#[test]
fn test_program_native_noop() {
logger::setup();
solana_logger::setup();
let loader = Loader::new_native();
let name = String::from("noop");
@@ -202,7 +202,7 @@ fn test_program_native_noop() {
#[test]
fn test_program_lua_move_funds() {
logger::setup();
solana_logger::setup();
let loader = Loader::new_dynamic("solana_lua_loader");
let userdata = r#"
@@ -269,7 +269,7 @@ fn test_program_lua_move_funds() {
#[cfg(feature = "bpf_c")]
#[test]
fn test_program_builtin_bpf_noop() {
logger::setup();
solana_logger::setup();
let mut file = File::open(create_bpf_path("noop")).expect("file open failed");
let mut elf = Vec::new();
@@ -297,7 +297,7 @@ fn test_program_builtin_bpf_noop() {
#[cfg(feature = "bpf_c")]
#[test]
fn test_program_bpf_c() {
logger::setup();
solana_logger::setup();
let programs = [
"noop",