From 8ba1aed5a35a847657b35937e9bfd8925caf9e75 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 14 Dec 2018 15:34:17 -0800 Subject: [PATCH] Fix up tests --- Cargo.lock | 2 +- drone/Cargo.toml | 1 - drone/src/drone.rs | 39 ++++++++++++++++----------------------- metrics/Cargo.toml | 3 +++ metrics/src/metrics.rs | 7 ++++--- wallet/src/wallet.rs | 10 +++++----- 6 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c5933944..bbcb4b660 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1858,7 +1858,6 @@ dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.11.0", "solana-metrics 0.11.0", "solana-sdk 0.11.0", "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2097,6 +2096,7 @@ dependencies = [ "influx_db_client 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", "solana-sdk 0.11.0", "sys-info 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/drone/Cargo.toml b/drone/Cargo.toml index 4b8cfc00c..78d0c674a 100644 --- a/drone/Cargo.toml +++ b/drone/Cargo.toml @@ -18,7 +18,6 @@ clap = "2.31" log = "0.4.2" serde = "1.0.82" serde_derive = "1.0.82" -solana-logger = { path = "../logger", version = "0.11.0" } solana-sdk = { path = "../sdk", version = "0.11.0" } solana-metrics = { path = "../metrics", version = "0.11.0" } tokio = "0.1" diff --git a/drone/src/drone.rs b/drone/src/drone.rs index 9d93b71d9..9d9decbdd 100644 --- a/drone/src/drone.rs +++ b/drone/src/drone.rs @@ -294,27 +294,13 @@ pub fn run_local_drone(mint_keypair: Keypair, sender: Sender) { #[cfg(test)] mod tests { - use bank::Bank; - use cluster_info::Node; - use drone::{Drone, DroneRequest, REQUEST_CAP, TIME_SLICE}; - use fullnode::Fullnode; - use leader_scheduler::LeaderScheduler; - use ledger::get_tmp_ledger_path; - use logger; - use mint::Mint; - use netutil::get_ip_addr; + use super::*; use solana_sdk::signature::{Keypair, KeypairUtil}; - use std::fs::remove_dir_all; - use std::net::{SocketAddr, UdpSocket}; - use std::sync::{Arc, RwLock}; use std::time::Duration; - use thin_client::ThinClient; #[test] fn test_check_request_limit() { let keypair = Keypair::new(); - let mut addr: SocketAddr = "0.0.0.0:9900".parse().unwrap(); - addr.set_ip(get_ip_addr().unwrap()); let mut drone = Drone::new(keypair, None, Some(3)); assert!(drone.check_request_limit(1)); drone.request_current = 3; @@ -324,8 +310,6 @@ mod tests { #[test] fn test_clear_request_count() { let keypair = Keypair::new(); - let mut addr: SocketAddr = "0.0.0.0:9900".parse().unwrap(); - addr.set_ip(get_ip_addr().unwrap()); let mut drone = Drone::new(keypair, None, None); drone.request_current = drone.request_current + 256; assert_eq!(drone.request_current, 256); @@ -336,8 +320,6 @@ mod tests { #[test] fn test_add_ip_to_cache() { let keypair = Keypair::new(); - let mut addr: SocketAddr = "0.0.0.0:9900".parse().unwrap(); - addr.set_ip(get_ip_addr().unwrap()); let mut drone = Drone::new(keypair, None, None); let ip = "127.0.0.1".parse().expect("create IpAddr from string"); assert_eq!(drone.ip_cache.len(), 0); @@ -349,8 +331,6 @@ mod tests { #[test] fn test_clear_ip_cache() { let keypair = Keypair::new(); - let mut addr: SocketAddr = "0.0.0.0:9900".parse().unwrap(); - addr.set_ip(get_ip_addr().unwrap()); let mut drone = Drone::new(keypair, None, None); let ip = "127.0.0.1".parse().expect("create IpAddr from string"); assert_eq!(drone.ip_cache.len(), 0); @@ -364,8 +344,6 @@ mod tests { #[test] fn test_drone_default_init() { let keypair = Keypair::new(); - let mut addr: SocketAddr = "0.0.0.0:9900".parse().unwrap(); - addr.set_ip(get_ip_addr().unwrap()); let time_slice: Option = None; let request_cap: Option = None; let drone = Drone::new(keypair, time_slice, request_cap); @@ -373,9 +351,23 @@ mod tests { assert_eq!(drone.request_cap, REQUEST_CAP); } + /* #[test] #[ignore] fn test_send_airdrop() { + use solana::bank::Bank; + use solana::cluster_info::Node; + use solana::fullnode::Fullnode; + use solana::leader_scheduler::LeaderScheduler; + use solana::ledger::get_tmp_ledger_path; + use solana::mint::Mint; + use solana::netutil::get_ip_addr; + use solana::thin_client::ThinClient; + use solana_logger; + use std::fs::remove_dir_all; + use std::net::UdpSocket; + use std::sync::{Arc, RwLock}; + const SMALL_BATCH: u64 = 50; const TPS_BATCH: u64 = 5_000_000; @@ -471,4 +463,5 @@ mod tests { server.close().unwrap(); remove_dir_all(ledger_path).unwrap(); } + */ } diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 9bce4fda0..c55d0e21d 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -15,5 +15,8 @@ lazy_static = "1.2.0" sys-info = "0.5.6" solana-sdk = { path = "../sdk", version = "0.11.0" } +[dev-dependencies] +rand = "0.6.1" + [lib] name = "solana_metrics" diff --git a/metrics/src/metrics.rs b/metrics/src/metrics.rs index fa37edc8f..0c49ea82c 100644 --- a/metrics/src/metrics.rs +++ b/metrics/src/metrics.rs @@ -267,8 +267,9 @@ pub fn set_panic_hook(program: &'static str) { #[cfg(test)] mod test { + extern crate rand; + use super::*; - use rand::random; use std::sync::atomic::{AtomicUsize, Ordering}; struct MockMetricsWriter { @@ -371,11 +372,11 @@ mod test { .add_tag("test", influxdb::Value::Boolean(true)) .add_field( "random_bool", - influxdb::Value::Boolean(random::() < 128), + influxdb::Value::Boolean(rand::random::() < 128), ) .add_field( "random_int", - influxdb::Value::Integer(random::() as i64), + influxdb::Value::Integer(rand::random::() as i64), ) .to_owned(); agent.submit(point); diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs index 3da0fb589..4565cdd76 100644 --- a/wallet/src/wallet.rs +++ b/wallet/src/wallet.rs @@ -807,13 +807,13 @@ fn request_and_confirm_airdrop( #[cfg(test)] mod tests { use super::*; - use crate::bank::Bank; - use crate::cluster_info::Node; - use crate::fullnode::Fullnode; - use crate::leader_scheduler::LeaderScheduler; - use crate::ledger::create_tmp_genesis; use clap::{App, Arg, SubCommand}; use serde_json::Value; + use solana::bank::Bank; + use solana::cluster_info::Node; + use solana::fullnode::Fullnode; + use solana::leader_scheduler::LeaderScheduler; + use solana::ledger::create_tmp_genesis; use solana_drone::drone::run_local_drone; use solana_sdk::signature::{gen_keypair_file, read_keypair, read_pkcs8, Keypair, KeypairUtil}; use std::fs;