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

30
Cargo.lock generated
View File

@ -1731,7 +1731,6 @@ dependencies = [
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1764,6 +1763,7 @@ dependencies = [
"solana-jsonrpc-pubsub 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "solana-jsonrpc-pubsub 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-jsonrpc-ws-server 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "solana-jsonrpc-ws-server 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-keygen 0.11.0", "solana-keygen 0.11.0",
"solana-logger 0.11.0",
"solana-lualoader 0.11.0", "solana-lualoader 0.11.0",
"solana-metrics 0.11.0", "solana-metrics 0.11.0",
"solana-native-loader 0.11.0", "solana-native-loader 0.11.0",
@ -1784,6 +1784,7 @@ version = "0.11.0"
dependencies = [ dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-logger 0.11.0",
] ]
[[package]] [[package]]
@ -1795,6 +1796,7 @@ dependencies = [
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-drone 0.11.0", "solana-drone 0.11.0",
"solana-logger 0.11.0",
"solana-metrics 0.11.0", "solana-metrics 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -1814,10 +1816,10 @@ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"elf 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "elf 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
"solana_rbpf 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "solana_rbpf 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1828,10 +1830,10 @@ version = "0.11.0"
dependencies = [ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 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)", "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -1846,6 +1848,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 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)", "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-metrics 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
"tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1857,10 +1860,10 @@ name = "solana-erc20"
version = "0.11.0" version = "0.11.0"
dependencies = [ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 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)", "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -1874,6 +1877,7 @@ dependencies = [
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-drone 0.11.0", "solana-drone 0.11.0",
"solana-logger 0.11.0",
"solana-metrics 0.11.0", "solana-metrics 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -1887,6 +1891,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -2052,6 +2057,14 @@ dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-logger 0.11.0",
]
[[package]]
name = "solana-logger"
version = "0.11.0"
dependencies = [
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2059,11 +2072,11 @@ name = "solana-lualoader"
version = "0.11.0" version = "0.11.0"
dependencies = [ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rlua 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "rlua 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.82 (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)", "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -2105,6 +2118,7 @@ dependencies = [
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -2133,10 +2147,10 @@ name = "solana-storage-program"
version = "0.11.0" version = "0.11.0"
dependencies = [ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 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)", "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -2145,7 +2159,6 @@ name = "solana-system-program"
version = "0.11.0" version = "0.11.0"
dependencies = [ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
@ -2164,10 +2177,10 @@ name = "solana-vote-program"
version = "0.11.0" version = "0.11.0"
dependencies = [ dependencies = [
"bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "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 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)", "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-metrics 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
@ -2199,6 +2212,7 @@ dependencies = [
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0", "solana 0.11.0",
"solana-drone 0.11.0", "solana-drone 0.11.0",
"solana-logger 0.11.0",
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]

3
Cargo.toml
View File

@ -31,7 +31,6 @@ bytes = "0.4"
chrono = { version = "0.4.0", features = ["serde"] } chrono = { version = "0.4.0", features = ["serde"] }
clap = "2.31" clap = "2.31"
dirs = "1.0.2" dirs = "1.0.2"
env_logger = "0.6.0"
generic-array = { version = "0.12.0", default-features = false, features = ["serde"] } generic-array = { version = "0.12.0", default-features = false, features = ["serde"] }
hex-literal = "0.1.1" hex-literal = "0.1.1"
indexmap = "1.0" indexmap = "1.0"
@ -64,6 +63,7 @@ solana-jsonrpc-macros = "0.4.0"
solana-jsonrpc-pubsub = "0.4.0" solana-jsonrpc-pubsub = "0.4.0"
solana-jsonrpc-ws-server = "0.4.0" solana-jsonrpc-ws-server = "0.4.0"
solana-keygen = { path = "keygen", version = "0.11.0" } solana-keygen = { path = "keygen", version = "0.11.0" }
solana-logger = { path = "logger", version = "0.11.0" }
solana-lualoader = { path = "programs/native/lua_loader", version = "0.11.0" } solana-lualoader = { path = "programs/native/lua_loader", version = "0.11.0" }
solana-metrics = { path = "metrics", version = "0.11.0" } solana-metrics = { path = "metrics", version = "0.11.0" }
solana-native-loader = { path = "programs/native/native_loader", version = "0.11.0" } solana-native-loader = { path = "programs/native/native_loader", version = "0.11.0" }
@ -110,6 +110,7 @@ members = [
"genesis", "genesis",
"keygen", "keygen",
"ledger-tool", "ledger-tool",
"logger",
"metrics", "metrics",
"programs/bpf/rust/noop", "programs/bpf/rust/noop",
"programs/native/bpf_loader", "programs/native/bpf_loader",

1
bench-streamer/Cargo.toml
View File

@ -10,6 +10,7 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
[features] [features]
cuda = [] cuda = []

1
bench-tps/Cargo.toml
View File

@ -13,6 +13,7 @@ rayon = "1.0.3"
serde_json = "1.0.10" serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-drone = { path = "../drone", version = "0.11.0" } solana-drone = { path = "../drone", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
solana-metrics = { path = "../metrics", version = "0.11.0" } solana-metrics = { path = "../metrics", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" } solana-sdk = { path = "../sdk", version = "0.11.0" }

4
bench-tps/src/main.rs
View File

@ -10,7 +10,7 @@ mod cli;
use solana::client::mk_client; use solana::client::mk_client;
use solana::cluster_info::{ClusterInfo, NodeInfo}; use solana::cluster_info::{ClusterInfo, NodeInfo};
use solana::gossip_service::GossipService; use solana::gossip_service::GossipService;
use solana::logger;
use solana::service::Service; use solana::service::Service;
use solana::signature::GenKeys; use solana::signature::GenKeys;
use solana::thin_client::poll_gossip_for_leader; use solana::thin_client::poll_gossip_for_leader;
@ -76,7 +76,7 @@ fn converge(
} }
fn main() { fn main() {
logger::setup(); solana_logger::setup();
solana_metrics::set_panic_hook("bench-tps"); solana_metrics::set_panic_hook("bench-tps");
let matches = cli::build_args().get_matches(); let matches = cli::build_args().get_matches();

1
ci/publish-crate.sh
View File

@ -11,6 +11,7 @@ cd "$(dirname "$0")/.."
# here. (TODO: figure the crate ordering dynamically) # here. (TODO: figure the crate ordering dynamically)
# #
CRATES=( CRATES=(
logger
sdk sdk
keygen keygen
metrics metrics

1
drone/Cargo.toml
View File

@ -18,6 +18,7 @@ clap = "2.31"
log = "0.4.2" log = "0.4.2"
serde = "1.0.82" serde = "1.0.82"
serde_derive = "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-sdk = { path = "../sdk", version = "0.11.0" }
solana-metrics = { path = "../metrics", version = "0.11.0" } solana-metrics = { path = "../metrics", version = "0.11.0" }
tokio = "0.1" tokio = "0.1"

7
drone/src/bin/drone.rs
View File

@ -1,4 +1,3 @@
extern crate bincode;
extern crate byteorder; extern crate byteorder;
extern crate bytes; extern crate bytes;
#[macro_use] #[macro_use]
@ -11,12 +10,10 @@ extern crate solana_sdk;
extern crate tokio; extern crate tokio;
extern crate tokio_codec; extern crate tokio_codec;
use bincode::{deserialize, serialize};
use byteorder::{ByteOrder, LittleEndian}; use byteorder::{ByteOrder, LittleEndian};
use bytes::Bytes; use bytes::Bytes;
use clap::{App, Arg}; use clap::{App, Arg};
use solana_drone::drone::{Drone, DroneRequest, DRONE_PORT}; use solana_drone::drone::{Drone, DroneRequest, DRONE_PORT};
//use solana::logger;
use solana_sdk::signature::read_keypair; use solana_sdk::signature::read_keypair;
use std::error; use std::error;
use std::io; use std::io;
@ -100,7 +97,7 @@ fn main() -> Result<(), Box<error::Error>> {
let (writer, reader) = framed.split(); let (writer, reader) = framed.split();
let processor = reader.and_then(move |bytes| { let processor = reader.and_then(move |bytes| {
let req: DroneRequest = deserialize(&bytes).or_else(|err| { let req: DroneRequest = bincode::deserialize(&bytes).or_else(|err| {
Err(io::Error::new( Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
format!("deserialize packet in drone: {:?}", err), format!("deserialize packet in drone: {:?}", err),
@ -112,7 +109,7 @@ fn main() -> Result<(), Box<error::Error>> {
let res = drone2.lock().unwrap().build_airdrop_transaction(req); let res = drone2.lock().unwrap().build_airdrop_transaction(req);
match res { match res {
Ok(tx) => { Ok(tx) => {
let response_vec = serialize(&tx).or_else(|err| { let response_vec = bincode::serialize(&tx).or_else(|err| {
Err(io::Error::new( Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
format!("deserialize packet in drone: {:?}", err), format!("deserialize packet in drone: {:?}", err),

2
drone/src/drone.rs
View File

@ -379,7 +379,7 @@ mod tests {
const SMALL_BATCH: u64 = 50; const SMALL_BATCH: u64 = 50;
const TPS_BATCH: u64 = 5_000_000; const TPS_BATCH: u64 = 5_000_000;
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());

1
fullnode-config/Cargo.toml
View File

@ -13,6 +13,7 @@ dirs = "1.0.2"
log = "0.4.2" log = "0.4.2"
serde_json = "1.0.10" serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" } solana-sdk = { path = "../sdk", version = "0.11.0" }
[features] [features]

4
fullnode-config/src/main.rs
View File

@ -7,14 +7,14 @@ use serde_json;
use clap::{App, Arg}; use clap::{App, Arg};
use solana::cluster_info::FULLNODE_PORT_RANGE; use solana::cluster_info::FULLNODE_PORT_RANGE;
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::logger;
use solana::netutil::{get_ip_addr, get_public_ip_addr, parse_port_or_addr}; use solana::netutil::{get_ip_addr, get_public_ip_addr, parse_port_or_addr};
use solana_sdk::signature::{gen_pkcs8, read_pkcs8}; use solana_sdk::signature::{gen_pkcs8, read_pkcs8};
use std::io; use std::io;
use std::net::SocketAddr; use std::net::SocketAddr;
fn main() { fn main() {
logger::setup(); solana_logger::setup();
let matches = App::new("fullnode-config") let matches = App::new("fullnode-config")
.version(crate_version!()) .version(crate_version!())
.arg( .arg(

1
fullnode/Cargo.toml
View File

@ -14,6 +14,7 @@ rayon = "1.0.3"
serde_json = "1.0.10" serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-drone = { path = "../drone", version = "0.11.0" } solana-drone = { path = "../drone", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
solana-metrics = { path = "../metrics", version = "0.11.0" } solana-metrics = { path = "../metrics", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" } solana-sdk = { path = "../sdk", version = "0.11.0" }

4
fullnode/src/main.rs
View File

@ -13,7 +13,7 @@ use solana::client::mk_client;
use solana::cluster_info::{Node, FULLNODE_PORT_RANGE}; use solana::cluster_info::{Node, FULLNODE_PORT_RANGE};
use solana::fullnode::{Config, Fullnode, FullnodeReturnType}; use solana::fullnode::{Config, Fullnode, FullnodeReturnType};
use solana::leader_scheduler::LeaderScheduler; use solana::leader_scheduler::LeaderScheduler;
use solana::logger;
use solana::netutil::find_available_port_in_range; use solana::netutil::find_available_port_in_range;
use solana::thin_client::poll_gossip_for_leader; use solana::thin_client::poll_gossip_for_leader;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
@ -27,7 +27,7 @@ use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
fn main() { fn main() {
logger::setup(); solana_logger::setup();
solana_metrics::set_panic_hook("fullnode"); solana_metrics::set_panic_hook("fullnode");
let matches = App::new("fullnode") let matches = App::new("fullnode")
.version(crate_version!()) .version(crate_version!())

1
ledger-tool/Cargo.toml
View File

@ -11,6 +11,7 @@ homepage = "https://solana.com/"
clap = "2.32.0" clap = "2.32.0"
serde_json = "1.0.10" serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
[features] [features]
cuda = [] cuda = []

4
ledger-tool/src/main.rs
View File

@ -5,12 +5,12 @@ use serde_json;
use clap::{App, Arg, SubCommand}; use clap::{App, Arg, SubCommand};
use solana::bank::Bank; use solana::bank::Bank;
use solana::ledger::{read_ledger, verify_ledger}; use solana::ledger::{read_ledger, verify_ledger};
use solana::logger;
use std::io::{stdout, Write}; use std::io::{stdout, Write};
use std::process::exit; use std::process::exit;
fn main() { fn main() {
logger::setup(); solana_logger::setup();
let matches = App::new("ledger-tool") let matches = App::new("ledger-tool")
.version(crate_version!()) .version(crate_version!())
.arg( .arg(

15
logger/Cargo.toml Normal file
View File

@ -0,0 +1,15 @@
[package]
name = "solana-logger"
version = "0.11.0"
description = "Solana Logger"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
edition = "2018"
[dependencies]
env_logger = "0.6.0"
[lib]
name = "solana_logger"

0
src/logger.rs → logger/src/lib.rs
View File

2
programs/native/bpf_loader/Cargo.toml
View File

@ -14,11 +14,11 @@ bpf_c = []
bincode = "1.0.0" bincode = "1.0.0"
byteorder = "1.2.1" byteorder = "1.2.1"
elf = "0.0.10" elf = "0.0.10"
env_logger = "0.6.0"
libc = "0.2.45" libc = "0.2.45"
log = "0.4.2" log = "0.4.2"
solana_rbpf = "=0.1.5" solana_rbpf = "=0.1.5"
serde = "1.0.82" serde = "1.0.82"
solana-logger = { path = "../../../logger", version = "0.11.0" }
solana-sdk = { path = "../../../sdk", version = "0.11.0" } solana-sdk = { path = "../../../sdk", version = "0.11.0" }
[lib] [lib]

12
programs/native/bpf_loader/src/lib.rs
View File

@ -1,8 +1,6 @@
pub mod bpf_verifier; pub mod bpf_verifier;
extern crate bincode;
extern crate byteorder; extern crate byteorder;
extern crate env_logger;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate libc; extern crate libc;
@ -10,7 +8,6 @@ extern crate solana_rbpf;
#[macro_use] #[macro_use]
extern crate solana_sdk; extern crate solana_sdk;
use bincode::deserialize;
use byteorder::{ByteOrder, LittleEndian, WriteBytesExt}; use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
use libc::c_char; use libc::c_char;
use solana_rbpf::EbpfVmRaw; use solana_rbpf::EbpfVmRaw;
@ -22,7 +19,6 @@ use std::ffi::CStr;
use std::io::prelude::*; use std::io::prelude::*;
use std::io::{Error, ErrorKind}; use std::io::{Error, ErrorKind};
use std::mem; use std::mem;
use std::sync::{Once, ONCE_INIT};
// TODO use rbpf's disassemble // TODO use rbpf's disassemble
#[allow(dead_code)] #[allow(dead_code)]
@ -153,11 +149,7 @@ fn entrypoint(
tx_data: &[u8], tx_data: &[u8],
tick_height: u64, tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
static INIT: Once = ONCE_INIT; solana_logger::setup();
INIT.call_once(|| {
// env_logger can only be initialized once
env_logger::init();
});
if keyed_accounts[0].account.executable { if keyed_accounts[0].account.executable {
let prog = keyed_accounts[0].account.userdata.clone(); let prog = keyed_accounts[0].account.userdata.clone();
@ -188,7 +180,7 @@ fn entrypoint(
"BPF program executed {} instructions", "BPF program executed {} instructions",
vm.get_last_instruction_count() vm.get_last_instruction_count()
); );
} else if let Ok(instruction) = deserialize(tx_data) { } else if let Ok(instruction) = bincode::deserialize(tx_data) {
if keyed_accounts[0].signer_key().is_none() { if keyed_accounts[0].signer_key().is_none() {
warn!("key[0] did not sign the transaction"); warn!("key[0] did not sign the transaction");
return Err(ProgramError::GenericError); return Err(ProgramError::GenericError);

2
programs/native/budget/Cargo.toml
View File

@ -10,10 +10,10 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
bincode = "1.0.0" bincode = "1.0.0"
chrono = { version = "0.4.0", features = ["serde"] } chrono = { version = "0.4.0", features = ["serde"] }
env_logger = "0.6.0"
log = "0.4.2" log = "0.4.2"
serde = "1.0.82" serde = "1.0.82"
serde_derive = "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-sdk = { path = "../../../sdk", version = "0.11.0" }
[lib] [lib]

8
programs/native/budget/src/lib.rs
View File

@ -1,6 +1,5 @@
extern crate bincode; extern crate bincode;
extern crate chrono; extern crate chrono;
extern crate env_logger;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
#[macro_use] #[macro_use]
@ -13,7 +12,6 @@ mod budget_program;
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use std::sync::{Once, ONCE_INIT};
use budget_program::process_instruction; use budget_program::process_instruction;
@ -24,11 +22,7 @@ fn entrypoint(
data: &[u8], data: &[u8],
_tick_height: u64, _tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
static INIT: Once = ONCE_INIT; solana_logger::setup();
INIT.call_once(|| {
// env_logger can only be initialized once
env_logger::init();
});
trace!("process_instruction: {:?}", data); trace!("process_instruction: {:?}", data);
trace!("keyed_accounts: {:?}", keyed_accounts); trace!("keyed_accounts: {:?}", keyed_accounts);

2
programs/native/erc20/Cargo.toml
View File

@ -9,10 +9,10 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
bincode = "1.0.0" bincode = "1.0.0"
env_logger = "0.6.0"
log = "0.4.2" log = "0.4.2"
serde = "1.0.82" serde = "1.0.82"
serde_derive = "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-sdk = { path = "../../../sdk", version = "0.11.0" }
[lib] [lib]

6
programs/native/erc20/src/lib.rs
View File

@ -1,7 +1,6 @@
//! The `erc20` library implements a generic erc20-like token //! The `erc20` library implements a generic erc20-like token
extern crate bincode; extern crate bincode;
extern crate env_logger;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate serde; extern crate serde;
@ -13,7 +12,6 @@ extern crate solana_sdk;
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use std::sync::{Once, ONCE_INIT};
mod token_program; mod token_program;
@ -24,9 +22,7 @@ fn entrypoint(
input: &[u8], input: &[u8],
_tick_height: u64, _tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
// env_logger can only be initialized once solana_logger::setup();
static INIT: Once = ONCE_INIT;
INIT.call_once(env_logger::init);
token_program::TokenProgram::process(program_id, info, input).map_err(|err| { token_program::TokenProgram::process(program_id, info, input).map_err(|err| {
error!("error: {:?}", err); error!("error: {:?}", err);

2
programs/native/lua_loader/Cargo.toml
View File

@ -9,11 +9,11 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
bincode = "1.0.0" bincode = "1.0.0"
env_logger = "0.6.0"
log = "0.4.2" log = "0.4.2"
rlua = "0.15.2" rlua = "0.15.2"
serde = "1.0.82" serde = "1.0.82"
serde_derive = "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-sdk = { path = "../../../sdk", version = "0.11.0" }
[dev-dependencies] [dev-dependencies]

12
programs/native/lua_loader/src/lib.rs
View File

@ -1,19 +1,15 @@
extern crate bincode;
extern crate env_logger;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate rlua; extern crate rlua;
#[macro_use] #[macro_use]
extern crate solana_sdk; extern crate solana_sdk;
use bincode::deserialize;
use rlua::{Lua, Table}; use rlua::{Lua, Table};
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::loader_instruction::LoaderInstruction; use solana_sdk::loader_instruction::LoaderInstruction;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use std::str; use std::str;
use std::sync::{Once, ONCE_INIT};
/// Make KeyAccount values available to Lua. /// Make KeyAccount values available to Lua.
fn set_accounts(lua: &Lua, name: &str, keyed_accounts: &[KeyedAccount]) -> rlua::Result<()> { fn set_accounts(lua: &Lua, name: &str, keyed_accounts: &[KeyedAccount]) -> rlua::Result<()> {
@ -68,11 +64,7 @@ fn entrypoint(
tx_data: &[u8], tx_data: &[u8],
_tick_height: u64, _tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
static INIT: Once = ONCE_INIT; solana_logger::setup();
INIT.call_once(|| {
// env_logger can only be initialized once
env_logger::init();
});
if keyed_accounts[0].account.executable { if keyed_accounts[0].account.executable {
let code = keyed_accounts[0].account.userdata.clone(); let code = keyed_accounts[0].account.userdata.clone();
@ -86,7 +78,7 @@ fn entrypoint(
return Err(ProgramError::GenericError); return Err(ProgramError::GenericError);
} }
} }
} else if let Ok(instruction) = deserialize(tx_data) { } else if let Ok(instruction) = bincode::deserialize(tx_data) {
if keyed_accounts[0].signer_key().is_none() { if keyed_accounts[0].signer_key().is_none() {
warn!("key[0] did not sign the transaction"); warn!("key[0] did not sign the transaction");
return Err(ProgramError::GenericError); return Err(ProgramError::GenericError);

2
programs/native/storage/Cargo.toml
View File

@ -9,10 +9,10 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
bincode = "1.0.0" bincode = "1.0.0"
env_logger = "0.6.0"
log = "0.4.2" log = "0.4.2"
serde = "1.0.27" serde = "1.0.27"
serde_derive = "1.0.27" serde_derive = "1.0.27"
solana-logger = { path = "../../../logger", version = "0.11.0" }
solana-sdk = { path = "../../../sdk", version = "0.11.0" } solana-sdk = { path = "../../../sdk", version = "0.11.0" }
[lib] [lib]

7
programs/native/storage/src/lib.rs
View File

@ -2,14 +2,11 @@
//! Receive mining proofs from miners, validate the answers //! Receive mining proofs from miners, validate the answers
//! and give reward for good proofs. //! and give reward for good proofs.
extern crate bincode;
extern crate env_logger;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
#[macro_use] #[macro_use]
extern crate solana_sdk; extern crate solana_sdk;
use bincode::deserialize;
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
@ -22,13 +19,15 @@ fn entrypoint(
data: &[u8], data: &[u8],
_tick_height: u64, _tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
solana_logger::setup();
// accounts_keys[0] must be signed // accounts_keys[0] must be signed
if keyed_accounts[0].signer_key().is_none() { if keyed_accounts[0].signer_key().is_none() {
info!("account[0] is unsigned"); info!("account[0] is unsigned");
Err(ProgramError::InvalidArgument)?; Err(ProgramError::InvalidArgument)?;
} }
if let Ok(syscall) = deserialize(data) { if let Ok(syscall) = bincode::deserialize(data) {
match syscall { match syscall {
StorageProgram::SubmitMiningProof { StorageProgram::SubmitMiningProof {
sha_state, sha_state,

1
programs/native/system/Cargo.toml
View File

@ -9,7 +9,6 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
bincode = "1.0.0" bincode = "1.0.0"
env_logger = "0.6.0"
log = "0.4.2" log = "0.4.2"
serde = "1.0.27" serde = "1.0.27"
solana-sdk = { path = "../../../sdk", version = "0.11.0" } solana-sdk = { path = "../../../sdk", version = "0.11.0" }

4
programs/native/system/src/lib.rs
View File

@ -1,10 +1,8 @@
extern crate bincode;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
#[macro_use] #[macro_use]
extern crate solana_sdk; extern crate solana_sdk;
use bincode::deserialize;
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
@ -18,7 +16,7 @@ pub fn entrypoint(
data: &[u8], data: &[u8],
_tick_height: u64, _tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
if let Ok(syscall) = deserialize(data) { if let Ok(syscall) = bincode::deserialize(data) {
trace!("process_instruction: {:?}", syscall); trace!("process_instruction: {:?}", syscall);
trace!("keyed_accounts: {:?}", keyed_accounts); trace!("keyed_accounts: {:?}", keyed_accounts);
let from = 0; let from = 0;

2
programs/native/vote/Cargo.toml
View File

@ -9,10 +9,10 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
bincode = "1.0.0" bincode = "1.0.0"
env_logger = "0.6.0"
log = "0.4.2" log = "0.4.2"
serde = "1.0.82" serde = "1.0.82"
serde_derive = "1.0.82" serde_derive = "1.0.82"
solana-logger = { path = "../../../logger", version = "0.11.0" }
solana-metrics = { path = "../../../metrics", version = "0.11.0" } solana-metrics = { path = "../../../metrics", version = "0.11.0" }
solana-sdk = { path = "../../../sdk", version = "0.11.0" } solana-sdk = { path = "../../../sdk", version = "0.11.0" }

20
programs/native/vote/src/lib.rs
View File

@ -1,22 +1,16 @@
//! Vote program //! Vote program
//! Receive and processes votes from validators //! Receive and processes votes from validators
extern crate bincode;
extern crate env_logger;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate solana_metrics;
#[macro_use] #[macro_use]
extern crate solana_sdk; extern crate solana_sdk;
use bincode::deserialize;
use solana_metrics::{influxdb, submit};
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use solana_sdk::vote_program::*; use solana_sdk::vote_program::*;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::sync::{Once, ONCE_INIT};
solana_entrypoint!(entrypoint); solana_entrypoint!(entrypoint);
fn entrypoint( fn entrypoint(
@ -25,11 +19,7 @@ fn entrypoint(
data: &[u8], data: &[u8],
_tick_height: u64, _tick_height: u64,
) -> Result<(), ProgramError> { ) -> Result<(), ProgramError> {
static INIT: Once = ONCE_INIT; solana_logger::setup();
INIT.call_once(|| {
// env_logger can only be initialized once
env_logger::init();
});
trace!("process_instruction: {:?}", data); trace!("process_instruction: {:?}", data);
trace!("keyed_accounts: {:?}", keyed_accounts); trace!("keyed_accounts: {:?}", keyed_accounts);
@ -40,7 +30,7 @@ fn entrypoint(
Err(ProgramError::InvalidArgument)?; Err(ProgramError::InvalidArgument)?;
} }
match deserialize(data) { match bincode::deserialize(data) {
Ok(VoteInstruction::RegisterAccount) => { Ok(VoteInstruction::RegisterAccount) => {
if !check_id(&keyed_accounts[1].account.owner) { if !check_id(&keyed_accounts[1].account.owner) {
error!("account[1] is not assigned to the VOTE_PROGRAM"); error!("account[1] is not assigned to the VOTE_PROGRAM");
@ -64,9 +54,9 @@ fn entrypoint(
Err(ProgramError::InvalidArgument)?; Err(ProgramError::InvalidArgument)?;
} }
debug!("{:?} by {}", vote, keyed_accounts[0].signer_key().unwrap()); debug!("{:?} by {}", vote, keyed_accounts[0].signer_key().unwrap());
submit( solana_metrics::submit(
influxdb::Point::new("vote-native") solana_metrics::influxdb::Point::new("vote-native")
.add_field("count", influxdb::Value::Integer(1)) .add_field("count", solana_metrics::influxdb::Value::Integer(1))
.to_owned(), .to_owned(),
); );

1
replicator/Cargo.toml
View File

@ -12,6 +12,7 @@ clap = "2.32.0"
dirs = "1.0.2" dirs = "1.0.2"
serde_json = "1.0.10" serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" } solana-sdk = { path = "../sdk", version = "0.11.0" }
[features] [features]

4
replicator/src/main.rs
View File

@ -8,7 +8,7 @@ extern crate solana;
use clap::{App, Arg}; use clap::{App, Arg};
use solana::cluster_info::{Node, NodeInfo}; use solana::cluster_info::{Node, NodeInfo};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::logger;
use solana::replicator::Replicator; use solana::replicator::Replicator;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use std::fs::File; use std::fs::File;
@ -16,7 +16,7 @@ use std::net::{Ipv4Addr, SocketAddr};
use std::process::exit; use std::process::exit;
fn main() { fn main() {
logger::setup(); solana_logger::setup();
let matches = App::new("replicator") let matches = App::new("replicator")
.version(crate_version!()) .version(crate_version!())

6
src/chacha_cuda.rs
View File

@ -116,8 +116,7 @@ mod tests {
#[test] #[test]
fn test_encrypt_file_many_keys_single() { fn test_encrypt_file_many_keys_single() {
use crate::logger; solana_logger::setup();
logger::setup();
let entries = make_tiny_test_entries(32); let entries = make_tiny_test_entries(32);
let ledger_dir = "test_encrypt_file_many_keys_single"; let ledger_dir = "test_encrypt_file_many_keys_single";
@ -156,8 +155,7 @@ mod tests {
#[test] #[test]
fn test_encrypt_file_many_keys_multiple_keys() { fn test_encrypt_file_many_keys_multiple_keys() {
use crate::logger; solana_logger::setup();
logger::setup();
let entries = make_tiny_test_entries(32); let entries = make_tiny_test_entries(32);
let ledger_dir = "test_encrypt_file_many_keys_multiple"; let ledger_dir = "test_encrypt_file_many_keys_multiple";

6
src/cluster_info.rs
View File

@ -1109,7 +1109,7 @@ mod tests {
use crate::crds_value::CrdsValueLabel; use crate::crds_value::CrdsValueLabel;
use crate::db_ledger::DbLedger; use crate::db_ledger::DbLedger;
use crate::ledger::get_tmp_ledger_path; use crate::ledger::get_tmp_ledger_path;
use crate::logger;
use crate::packet::BLOB_HEADER_SIZE; use crate::packet::BLOB_HEADER_SIZE;
use crate::result::Error; use crate::result::Error;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
@ -1206,7 +1206,7 @@ mod tests {
/// test window requests respond with the right blob, and do not overrun /// test window requests respond with the right blob, and do not overrun
#[test] #[test]
fn run_window_request() { fn run_window_request() {
logger::setup(); solana_logger::setup();
let ledger_path = get_tmp_ledger_path("run_window_request"); let ledger_path = get_tmp_ledger_path("run_window_request");
{ {
let db_ledger = Arc::new(RwLock::new(DbLedger::open(&ledger_path).unwrap())); let db_ledger = Arc::new(RwLock::new(DbLedger::open(&ledger_path).unwrap()));
@ -1254,7 +1254,7 @@ mod tests {
#[test] #[test]
fn test_default_leader() { fn test_default_leader() {
logger::setup(); solana_logger::setup();
let node_info = NodeInfo::new_localhost(Keypair::new().pubkey(), 0); let node_info = NodeInfo::new_localhost(Keypair::new().pubkey(), 0);
let mut cluster_info = ClusterInfo::new(node_info); let mut cluster_info = ClusterInfo::new(node_info);
let network_entry_point = NodeInfo::new_entry_point(&socketaddr!("127.0.0.1:1239")); let network_entry_point = NodeInfo::new_entry_point(&socketaddr!("127.0.0.1:1239"));

4
src/compute_leader_finality_service.rs
View File

@ -150,7 +150,7 @@ pub mod tests {
use crate::bank::Bank; use crate::bank::Bank;
use crate::compute_leader_finality_service::ComputeLeaderFinalityService; use crate::compute_leader_finality_service::ComputeLeaderFinalityService;
use crate::create_vote_account::*; use crate::create_vote_account::*;
use crate::logger;
use crate::mint::Mint; use crate::mint::Mint;
use bincode::serialize; use bincode::serialize;
use solana_sdk::hash::hash; use solana_sdk::hash::hash;
@ -164,7 +164,7 @@ pub mod tests {
#[test] #[test]
fn test_compute_finality() { fn test_compute_finality() {
logger::setup(); solana_logger::setup();
let mint = Mint::new(1234); let mint = Mint::new(1234);
let dummy_leader_id = Keypair::new().pubkey(); let dummy_leader_id = Keypair::new().pubkey();

12
src/crds_gossip.rs
View File

@ -491,32 +491,28 @@ mod test {
#[test] #[test]
#[ignore] #[ignore]
fn test_star_network_large_pull() { fn test_star_network_large_pull() {
use crate::logger; solana_logger::setup();
logger::setup();
let mut network = star_network_create(2000); let mut network = star_network_create(2000);
network_simulator_pull_only(&mut network); network_simulator_pull_only(&mut network);
} }
#[test] #[test]
#[ignore] #[ignore]
fn test_rstar_network_large_push() { fn test_rstar_network_large_push() {
use crate::logger; solana_logger::setup();
logger::setup();
let mut network = rstar_network_create(4000); let mut network = rstar_network_create(4000);
network_simulator(&mut network); network_simulator(&mut network);
} }
#[test] #[test]
#[ignore] #[ignore]
fn test_ring_network_large_push() { fn test_ring_network_large_push() {
use crate::logger; solana_logger::setup();
logger::setup();
let mut network = ring_network_create(4001); let mut network = ring_network_create(4001);
network_simulator(&mut network); network_simulator(&mut network);
} }
#[test] #[test]
#[ignore] #[ignore]
fn test_star_network_large_push() { fn test_star_network_large_push() {
use crate::logger; solana_logger::setup();
logger::setup();
let mut network = star_network_create(4002); let mut network = star_network_create(4002);
network_simulator(&mut network); network_simulator(&mut network);
} }

3
src/crds_gossip_push.rs
View File

@ -342,8 +342,7 @@ mod test {
} }
#[test] #[test]
fn test_refresh_active_set() { fn test_refresh_active_set() {
use crate::logger; solana_logger::setup();
logger::setup();
let mut crds = Crds::default(); let mut crds = Crds::default();
let mut push = CrdsGossipPush::default(); let mut push = CrdsGossipPush::default();
let value1 = CrdsValue::ContactInfo(ContactInfo::new_localhost(Keypair::new().pubkey(), 0)); let value1 = CrdsValue::ContactInfo(ContactInfo::new_localhost(Keypair::new().pubkey(), 0));

8
src/erasure.rs
View File

@ -570,7 +570,7 @@ pub mod test {
use super::*; use super::*;
use crate::db_ledger::{DbLedger, DEFAULT_SLOT_HEIGHT}; use crate::db_ledger::{DbLedger, DEFAULT_SLOT_HEIGHT};
use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block}; use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
use crate::logger;
use crate::packet::{index_blobs, SharedBlob, BLOB_DATA_SIZE, BLOB_SIZE}; use crate::packet::{index_blobs, SharedBlob, BLOB_DATA_SIZE, BLOB_SIZE};
use crate::window::WindowSlot; use crate::window::WindowSlot;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};
@ -824,7 +824,7 @@ pub mod test {
// Remove a data block, test for successful recovery // Remove a data block, test for successful recovery
#[test] #[test]
pub fn test_window_recover_basic() { pub fn test_window_recover_basic() {
logger::setup(); solana_logger::setup();
// Setup the window // Setup the window
let offset = 0; let offset = 0;
@ -878,7 +878,7 @@ pub mod test {
// Remove a data and coding block, test for successful recovery // Remove a data and coding block, test for successful recovery
#[test] #[test]
pub fn test_window_recover_basic2() { pub fn test_window_recover_basic2() {
logger::setup(); solana_logger::setup();
// Setup the window // Setup the window
let offset = 0; let offset = 0;
@ -951,7 +951,7 @@ pub mod test {
// #[test] // #[test]
// #[ignore] // #[ignore]
// pub fn test_window_recover() { // pub fn test_window_recover() {
// logger::setup(); // solana_logger::setup();
// let offset = 4; // let offset = 4;
// let data_len = 16; // let data_len = 16;
// let num_blobs = NUM_DATA + 2; // let num_blobs = NUM_DATA + 2;

24
src/ledger.rs
View File

@ -731,8 +731,7 @@ mod tests {
#[test] #[test]
fn test_verify_slice() { fn test_verify_slice() {
use crate::logger; solana_logger::setup();
logger::setup();
let zero = Hash::default(); let zero = Hash::default();
let one = hash(&zero.as_ref()); let one = hash(&zero.as_ref());
assert!(vec![][..].verify(&zero)); // base case assert!(vec![][..].verify(&zero)); // base case
@ -775,8 +774,7 @@ mod tests {
#[test] #[test]
fn test_entries_to_blobs() { fn test_entries_to_blobs() {
use crate::logger; solana_logger::setup();
logger::setup();
let entries = make_test_entries(); let entries = make_test_entries();
let blob_q = entries.to_blobs(); let blob_q = entries.to_blobs();
@ -786,8 +784,7 @@ mod tests {
#[test] #[test]
fn test_bad_blobs_attack() { fn test_bad_blobs_attack() {
use crate::logger; solana_logger::setup();
logger::setup();
let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000); let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
let blobs_q = to_blobs(vec![(0, addr)]).unwrap(); // <-- attack! let blobs_q = to_blobs(vec![(0, addr)]).unwrap(); // <-- attack!
assert!(reconstruct_entries_from_blobs(blobs_q).is_err()); assert!(reconstruct_entries_from_blobs(blobs_q).is_err());
@ -795,8 +792,7 @@ mod tests {
#[test] #[test]
fn test_next_entries() { fn test_next_entries() {
use crate::logger; solana_logger::setup();
logger::setup();
let id = Hash::default(); let id = Hash::default();
let next_id = hash(&id.as_ref()); let next_id = hash(&id.as_ref());
let keypair = Keypair::new(); let keypair = Keypair::new();
@ -844,8 +840,7 @@ mod tests {
#[test] #[test]
fn test_ledger_reader_writer() { fn test_ledger_reader_writer() {
use crate::logger; solana_logger::setup();
logger::setup();
let ledger_path = get_tmp_ledger_path("test_ledger_reader_writer"); let ledger_path = get_tmp_ledger_path("test_ledger_reader_writer");
let entries = make_tiny_test_entries(10); let entries = make_tiny_test_entries(10);
@ -922,8 +917,7 @@ mod tests {
#[test] #[test]
fn test_recover_ledger() { fn test_recover_ledger() {
use crate::logger; solana_logger::setup();
logger::setup();
let entries = make_tiny_test_entries(10); let entries = make_tiny_test_entries(10);
let ledger_path = get_tmp_ledger_path("test_recover_ledger"); let ledger_path = get_tmp_ledger_path("test_recover_ledger");
@ -973,8 +967,7 @@ mod tests {
#[test] #[test]
fn test_verify_ledger() { fn test_verify_ledger() {
use crate::logger; solana_logger::setup();
logger::setup();
let entries = make_tiny_test_entries(10); let entries = make_tiny_test_entries(10);
let ledger_path = get_tmp_ledger_path("test_verify_ledger"); let ledger_path = get_tmp_ledger_path("test_verify_ledger");
@ -991,8 +984,7 @@ mod tests {
#[test] #[test]
fn test_get_entries_bytes() { fn test_get_entries_bytes() {
use crate::logger; solana_logger::setup();
logger::setup();
let entries = make_tiny_test_entries(10); let entries = make_tiny_test_entries(10);
let ledger_path = get_tmp_ledger_path("test_raw_entries"); let ledger_path = get_tmp_ledger_path("test_raw_entries");
{ {

1
src/lib.rs
View File

@ -42,7 +42,6 @@ pub mod gossip_service;
pub mod leader_scheduler; pub mod leader_scheduler;
pub mod ledger; pub mod ledger;
pub mod ledger_write_stage; pub mod ledger_write_stage;
pub mod logger;
pub mod mint; pub mod mint;
pub mod netutil; pub mod netutil;
pub mod packet; pub mod packet;

4
src/netutil.rs
View File

@ -203,14 +203,14 @@ pub fn find_available_port_in_range(range: (u16, u16)) -> io::Result<u16> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::logger;
use crate::netutil::*; use crate::netutil::*;
use ipnetwork::IpNetwork; use ipnetwork::IpNetwork;
use pnet_datalink as datalink; use pnet_datalink as datalink;
#[test] #[test]
fn test_find_eth0ish_ip_addr() { fn test_find_eth0ish_ip_addr() {
logger::setup(); solana_logger::setup();
macro_rules! mock_interface { macro_rules! mock_interface {
($name:ident, $ip_mask:expr) => { ($name:ident, $ip_mask:expr) => {

4
src/replay_stage.rs
View File

@ -256,7 +256,7 @@ mod test {
make_active_set_entries, LeaderScheduler, LeaderSchedulerConfig, make_active_set_entries, LeaderScheduler, LeaderSchedulerConfig,
}; };
use crate::ledger::{create_ticks, create_tmp_sample_ledger, LedgerWriter}; use crate::ledger::{create_ticks, create_tmp_sample_ledger, LedgerWriter};
use crate::logger;
use crate::packet::BlobError; use crate::packet::BlobError;
use crate::replay_stage::{ReplayStage, ReplayStageReturnType}; use crate::replay_stage::{ReplayStage, ReplayStageReturnType};
use crate::result::Error; use crate::result::Error;
@ -271,7 +271,7 @@ mod test {
#[test] #[test]
pub fn test_replay_stage_leader_rotation_exit() { pub fn test_replay_stage_leader_rotation_exit() {
logger::setup(); solana_logger::setup();
// Set up dummy node to host a ReplayStage // Set up dummy node to host a ReplayStage
let my_keypair = Keypair::new(); let my_keypair = Keypair::new();

4
src/replicator.rs
View File

@ -301,7 +301,7 @@ impl Replicator {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::logger;
use crate::replicator::sample_file; use crate::replicator::sample_file;
use solana_sdk::hash::Hash; use solana_sdk::hash::Hash;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
@ -327,7 +327,7 @@ mod tests {
#[test] #[test]
fn test_sample_file() { fn test_sample_file() {
logger::setup(); solana_logger::setup();
let in_path = tmp_file_path("test_sample_file_input.txt"); let in_path = tmp_file_path("test_sample_file_input.txt");
let num_strings = 4096; let num_strings = 4096;
let string = "12foobar"; let string = "12foobar";

3
src/sigverify.rs
View File

@ -481,8 +481,7 @@ mod tests {
#[test] #[test]
fn test_verify_multi_sig() { fn test_verify_multi_sig() {
use crate::logger; solana_logger::setup();
logger::setup();
let keypair0 = Keypair::new(); let keypair0 = Keypair::new();
let keypair1 = Keypair::new(); let keypair1 = Keypair::new();
let keypairs = vec![&keypair0, &keypair1]; let keypairs = vec![&keypair0, &keypair1];

6
src/storage_stage.rs
View File

@ -339,7 +339,7 @@ mod tests {
use crate::entry::Entry; use crate::entry::Entry;
use crate::ledger::make_tiny_test_entries; use crate::ledger::make_tiny_test_entries;
use crate::ledger::{create_tmp_sample_ledger, LedgerWriter}; use crate::ledger::{create_tmp_sample_ledger, LedgerWriter};
use crate::logger;
use crate::service::Service; use crate::service::Service;
use crate::storage_stage::StorageState; use crate::storage_stage::StorageState;
use crate::storage_stage::NUM_IDENTITIES; use crate::storage_stage::NUM_IDENTITIES;
@ -380,7 +380,7 @@ mod tests {
#[test] #[test]
fn test_storage_stage_process_entries() { fn test_storage_stage_process_entries() {
logger::setup(); solana_logger::setup();
let keypair = Arc::new(Keypair::new()); let keypair = Arc::new(Keypair::new());
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
@ -445,7 +445,7 @@ mod tests {
#[test] #[test]
fn test_storage_stage_process_vote_entries() { fn test_storage_stage_process_vote_entries() {
logger::setup(); solana_logger::setup();
let keypair = Arc::new(Keypair::new()); let keypair = Arc::new(Keypair::new());
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));

14
src/thin_client.rs
View File

@ -430,7 +430,7 @@ mod tests {
use crate::fullnode::Fullnode; use crate::fullnode::Fullnode;
use crate::leader_scheduler::LeaderScheduler; use crate::leader_scheduler::LeaderScheduler;
use crate::ledger::create_tmp_ledger_with_mint; use crate::ledger::create_tmp_ledger_with_mint;
use crate::logger;
use crate::mint::Mint; use crate::mint::Mint;
use bincode::deserialize; use bincode::deserialize;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
@ -441,7 +441,7 @@ mod tests {
#[test] #[test]
fn test_thin_client() { fn test_thin_client() {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
let leader_data = leader.info.clone(); let leader_data = leader.info.clone();
@ -495,7 +495,7 @@ mod tests {
#[test] #[test]
#[ignore] #[ignore]
fn test_bad_sig() { fn test_bad_sig() {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
let alice = Mint::new(10_000); let alice = Mint::new(10_000);
@ -552,7 +552,7 @@ mod tests {
#[test] #[test]
fn test_client_check_signature() { fn test_client_check_signature() {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
let alice = Mint::new(10_000); let alice = Mint::new(10_000);
@ -597,7 +597,7 @@ mod tests {
#[test] #[test]
fn test_register_vote_account() { fn test_register_vote_account() {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
let mint = Mint::new(10_000); let mint = Mint::new(10_000);
@ -680,7 +680,7 @@ mod tests {
#[test] #[test]
fn test_transaction_count() { fn test_transaction_count() {
// set a bogus address, see that we don't hang // set a bogus address, see that we don't hang
logger::setup(); solana_logger::setup();
let addr = "0.0.0.0:1234".parse().unwrap(); let addr = "0.0.0.0:1234".parse().unwrap();
let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let mut client = let mut client =
@ -690,7 +690,7 @@ mod tests {
#[test] #[test]
fn test_zero_balance_after_nonzero() { fn test_zero_balance_after_nonzero() {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
let alice = Mint::new(10_000); let alice = Mint::new(10_000);

4
src/tvu.rs
View File

@ -185,7 +185,7 @@ pub mod tests {
use crate::gossip_service::GossipService; use crate::gossip_service::GossipService;
use crate::leader_scheduler::LeaderScheduler; use crate::leader_scheduler::LeaderScheduler;
use crate::ledger::get_tmp_ledger_path; use crate::ledger::get_tmp_ledger_path;
use crate::logger;
use crate::mint::Mint; use crate::mint::Mint;
use crate::packet::SharedBlob; use crate::packet::SharedBlob;
use crate::service::Service; use crate::service::Service;
@ -219,7 +219,7 @@ pub mod tests {
#[test] #[test]
#[ignore] #[ignore]
fn test_replay() { fn test_replay() {
logger::setup(); solana_logger::setup();
let leader = Node::new_localhost(); let leader = Node::new_localhost();
let target1_keypair = Keypair::new(); let target1_keypair = Keypair::new();
let target1 = Node::new_localhost_with_pubkey(target1_keypair.pubkey()); let target1 = Node::new_localhost_with_pubkey(target1_keypair.pubkey());

6
src/window_service.rs
View File

@ -237,7 +237,7 @@ mod test {
use crate::entry::Entry; use crate::entry::Entry;
use crate::leader_scheduler::LeaderScheduler; use crate::leader_scheduler::LeaderScheduler;
use crate::ledger::{get_tmp_ledger_path, make_consecutive_blobs}; use crate::ledger::{get_tmp_ledger_path, make_consecutive_blobs};
use crate::logger;
use crate::packet::{SharedBlob, PACKET_DATA_SIZE}; use crate::packet::{SharedBlob, PACKET_DATA_SIZE};
use crate::streamer::{blob_receiver, responder}; use crate::streamer::{blob_receiver, responder};
use crate::window_service::{repair_backoff, window_service}; use crate::window_service::{repair_backoff, window_service};
@ -267,7 +267,7 @@ mod test {
#[test] #[test]
pub fn window_send_test() { pub fn window_send_test() {
logger::setup(); solana_logger::setup();
let tn = Node::new_localhost(); let tn = Node::new_localhost();
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let mut cluster_info_me = ClusterInfo::new(tn.info.clone()); let mut cluster_info_me = ClusterInfo::new(tn.info.clone());
@ -338,7 +338,7 @@ mod test {
#[test] #[test]
pub fn window_send_leader_test2() { pub fn window_send_leader_test2() {
logger::setup(); solana_logger::setup();
let tn = Node::new_localhost(); let tn = Node::new_localhost();
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let cluster_info_me = ClusterInfo::new(tn.info.clone()); let cluster_info_me = ClusterInfo::new(tn.info.clone());

12
tests/data_replicator.rs
View File

@ -4,7 +4,7 @@ extern crate log;
use rayon::iter::*; use rayon::iter::*;
use solana::cluster_info::{ClusterInfo, Node}; use solana::cluster_info::{ClusterInfo, Node};
use solana::gossip_service::GossipService; use solana::gossip_service::GossipService;
use solana::logger;
use solana::packet::{Blob, SharedBlob}; use solana::packet::{Blob, SharedBlob};
use solana::result; use solana::result;
use solana::service::Service; use solana::service::Service;
@ -61,7 +61,7 @@ where
/// ring a -> b -> c -> d -> e -> a /// ring a -> b -> c -> d -> e -> a
#[test] #[test]
fn gossip_ring() -> result::Result<()> { fn gossip_ring() -> result::Result<()> {
logger::setup(); solana_logger::setup();
run_gossip_topo(50, |listen| { run_gossip_topo(50, |listen| {
let num = listen.len(); let num = listen.len();
for n in 0..num { for n in 0..num {
@ -82,7 +82,7 @@ fn gossip_ring() -> result::Result<()> {
#[test] #[test]
#[ignore] #[ignore]
fn gossip_ring_large() -> result::Result<()> { fn gossip_ring_large() -> result::Result<()> {
logger::setup(); solana_logger::setup();
run_gossip_topo(600, |listen| { run_gossip_topo(600, |listen| {
let num = listen.len(); let num = listen.len();
for n in 0..num { for n in 0..num {
@ -101,7 +101,7 @@ fn gossip_ring_large() -> result::Result<()> {
/// star a -> (b,c,d,e) /// star a -> (b,c,d,e)
#[test] #[test]
fn gossip_star() { fn gossip_star() {
logger::setup(); solana_logger::setup();
run_gossip_topo(50, |listen| { run_gossip_topo(50, |listen| {
let num = listen.len(); let num = listen.len();
for n in 0..(num - 1) { for n in 0..(num - 1) {
@ -120,7 +120,7 @@ fn gossip_star() {
/// rstar a <- (b,c,d,e) /// rstar a <- (b,c,d,e)
#[test] #[test]
fn gossip_rstar() { fn gossip_rstar() {
logger::setup(); solana_logger::setup();
run_gossip_topo(50, |listen| { run_gossip_topo(50, |listen| {
let num = listen.len(); let num = listen.len();
let xd = { let xd = {
@ -139,7 +139,7 @@ fn gossip_rstar() {
#[test] #[test]
pub fn cluster_info_retransmit() -> result::Result<()> { pub fn cluster_info_retransmit() -> result::Result<()> {
logger::setup(); solana_logger::setup();
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
trace!("c1:"); trace!("c1:");
let (c1, dr1, tn1) = test_node(exit.clone()); 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 // hard coded to 100 nodes
assert!(v <= 100); assert!(v <= 100);
v > 50 v > 50
}).unwrap_or(true) })
.unwrap_or(true)
} }
pub fn score(&self, vote: &Vote, fork_tree: &HashMap<usize, Fork>) -> usize { pub fn score(&self, vote: &Vote, fork_tree: &HashMap<usize, Fork>) -> usize {
let st = self.rollback_count(vote.time); 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, create_tmp_genesis, create_tmp_sample_ledger, read_ledger, tmp_copy_ledger, LedgerWindow,
LedgerWriter, LedgerWriter,
}; };
use solana::logger;
use solana::mint::Mint; use solana::mint::Mint;
use solana::packet::SharedBlob; use solana::packet::SharedBlob;
use solana::poh_service::NUM_TICKS_PER_SECOND; 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] #[test]
fn test_multi_node_ledger_window() -> result::Result<()> { fn test_multi_node_ledger_window() -> result::Result<()> {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader_pubkey = leader_keypair.pubkey().clone(); let leader_pubkey = leader_keypair.pubkey().clone();
@ -212,7 +212,7 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
#[test] #[test]
#[ignore] #[ignore]
fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> { fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
logger::setup(); solana_logger::setup();
const N: usize = 5; const N: usize = 5;
trace!("test_multi_node_validator_catchup_from_zero"); trace!("test_multi_node_validator_catchup_from_zero");
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
@ -358,7 +358,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
#[test] #[test]
#[ignore] #[ignore]
fn test_multi_node_basic() { fn test_multi_node_basic() {
logger::setup(); solana_logger::setup();
const N: usize = 5; const N: usize = 5;
trace!("test_multi_node_basic"); trace!("test_multi_node_basic");
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
@ -439,7 +439,7 @@ fn test_multi_node_basic() {
#[test] #[test]
#[ignore] #[ignore]
fn test_boot_validator_from_file() -> result::Result<()> { fn test_boot_validator_from_file() -> result::Result<()> {
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let leader_pubkey = leader_keypair.pubkey(); let leader_pubkey = leader_keypair.pubkey();
let leader = Node::new_localhost_with_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 // this test verifies that a freshly started leader makes his ledger available
// in the repair window to validators that are started with an older // in the repair window to validators that are started with an older
// ledger (currently up to WINDOW_SIZE entries) // ledger (currently up to WINDOW_SIZE entries)
logger::setup(); solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Arc::new(Keypair::new());
let initial_leader_balance = 500; let initial_leader_balance = 500;
@ -604,7 +604,7 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
#[test] #[test]
#[ignore] #[ignore]
fn test_multi_node_dynamic_network() { fn test_multi_node_dynamic_network() {
logger::setup(); solana_logger::setup();
assert!(cfg!(feature = "test")); assert!(cfg!(feature = "test"));
let key = "SOLANA_DYNAMIC_NODES"; let key = "SOLANA_DYNAMIC_NODES";
let num_nodes: usize = match env::var(key) { let num_nodes: usize = match env::var(key) {
@ -801,7 +801,7 @@ fn test_multi_node_dynamic_network() {
#[test] #[test]
fn test_leader_to_validator_transition() { fn test_leader_to_validator_transition() {
logger::setup(); solana_logger::setup();
let leader_rotation_interval = 20; let leader_rotation_interval = 20;
// Make a dummy validator id to be the next leader // Make a dummy validator id to be the next leader
@ -929,7 +929,7 @@ fn test_leader_to_validator_transition() {
#[test] #[test]
fn test_leader_validator_basic() { fn test_leader_validator_basic() {
logger::setup(); solana_logger::setup();
let leader_rotation_interval = 10; let leader_rotation_interval = 10;
// Account that will be the sink for all the test's transactions // Account that will be the sink for all the test's transactions
@ -1109,11 +1109,11 @@ fn run_node(
#[test] #[test]
#[ignore] #[ignore]
fn test_dropped_handoff_recovery() { fn test_dropped_handoff_recovery() {
logger::setup(); solana_logger::setup();
// The number of validators // The number of validators
const N: usize = 3; const N: usize = 3;
assert!(N > 1); assert!(N > 1);
logger::setup(); solana_logger::setup();
// Create the bootstrap leader node information // Create the bootstrap leader node information
let bootstrap_leader_keypair = Arc::new(Keypair::new()); let bootstrap_leader_keypair = Arc::new(Keypair::new());
@ -1257,10 +1257,10 @@ fn test_dropped_handoff_recovery() {
#[ignore] #[ignore]
//TODO: Ignore for now due to bug exposed by the test "test_dropped_handoff_recovery" //TODO: Ignore for now due to bug exposed by the test "test_dropped_handoff_recovery"
fn test_full_leader_validator_network() { fn test_full_leader_validator_network() {
logger::setup(); solana_logger::setup();
// The number of validators // The number of validators
const N: usize = 5; const N: usize = 5;
logger::setup(); solana_logger::setup();
// Create the bootstrap leader node information // Create the bootstrap leader node information
let bootstrap_leader_keypair = Keypair::new(); let bootstrap_leader_keypair = Keypair::new();
@ -1509,10 +1509,10 @@ fn test_full_leader_validator_network() {
#[test] #[test]
fn test_broadcast_last_tick() { fn test_broadcast_last_tick() {
logger::setup(); solana_logger::setup();
// The number of validators // The number of validators
const N: usize = 5; const N: usize = 5;
logger::setup(); solana_logger::setup();
// Create the bootstrap leader node information // Create the bootstrap leader node information
let bootstrap_leader_keypair = Keypair::new(); let bootstrap_leader_keypair = Keypair::new();

10
tests/programs.rs
View File

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

1
wallet/Cargo.toml
View File

@ -16,6 +16,7 @@ dirs = "1.0.2"
serde_json = "1.0.10" serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" } solana = { path = "..", version = "0.11.0" }
solana-drone = { path = "../drone", version = "0.11.0" } solana-drone = { path = "../drone", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" } solana-sdk = { path = "../sdk", version = "0.11.0" }
[features] [features]

4
wallet/src/main.rs
View File

@ -10,7 +10,7 @@ mod wallet;
use crate::wallet::{parse_command, process_command, WalletConfig, WalletError}; use crate::wallet::{parse_command, process_command, WalletConfig, WalletError};
use clap::{App, Arg, ArgMatches, SubCommand}; use clap::{App, Arg, ArgMatches, SubCommand};
use solana::logger;
use solana_sdk::signature::{gen_keypair_file, read_keypair, KeypairUtil}; use solana_sdk::signature::{gen_keypair_file, read_keypair, KeypairUtil};
use std::error; use std::error;
use std::net::SocketAddr; use std::net::SocketAddr;
@ -65,7 +65,7 @@ pub fn parse_args(matches: &ArgMatches<'_>) -> Result<WalletConfig, Box<dyn erro
} }
fn main() -> Result<(), Box<dyn error::Error>> { fn main() -> Result<(), Box<dyn error::Error>> {
logger::setup(); solana_logger::setup();
let matches = App::new("solana-wallet") let matches = App::new("solana-wallet")
.version(crate_version!()) .version(crate_version!())
.arg( .arg(