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

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

@ -1,4 +1,3 @@
extern crate bincode;
extern crate byteorder;
extern crate bytes;
#[macro_use]
@ -11,12 +10,10 @@ extern crate solana_sdk;
extern crate tokio;
extern crate tokio_codec;
use bincode::{deserialize, serialize};
use byteorder::{ByteOrder, LittleEndian};
use bytes::Bytes;
use clap::{App, Arg};
use solana_drone::drone::{Drone, DroneRequest, DRONE_PORT};
//use solana::logger;
use solana_sdk::signature::read_keypair;
use std::error;
use std::io;
@ -100,7 +97,7 @@ fn main() -> Result<(), Box<error::Error>> {
let (writer, reader) = framed.split();
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(
io::ErrorKind::Other,
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);
match res {
Ok(tx) => {
let response_vec = serialize(&tx).or_else(|err| {
let response_vec = bincode::serialize(&tx).or_else(|err| {
Err(io::Error::new(
io::ErrorKind::Other,
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 TPS_BATCH: u64 = 5_000_000;
logger::setup();
solana_logger::setup();
let leader_keypair = Arc::new(Keypair::new());
let leader = Node::new_localhost_with_pubkey(leader_keypair.pubkey());