From 172553c81e047d210f662d20f8f8cb3f6db68325 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 9 Jul 2016 16:39:59 +0200 Subject: [PATCH] Fix test. --- rpc/src/v1/tests/eth.rs | 2 +- util/src/log.rs | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/rpc/src/v1/tests/eth.rs b/rpc/src/v1/tests/eth.rs index 4e62bebfe..e3e07148e 100644 --- a/rpc/src/v1/tests/eth.rs +++ b/rpc/src/v1/tests/eth.rs @@ -64,7 +64,7 @@ fn miner_service(spec: Spec, accounts: Arc) -> Arc { work_queue_size: 50, enable_resubmission: true, }, - GasPricer::new_fixed(20000000000), + GasPricer::new_fixed(20_000_000_000u64.into()), spec, Some(accounts) ) diff --git a/util/src/log.rs b/util/src/log.rs index ff2ecd163..785737591 100644 --- a/util/src/log.rs +++ b/util/src/log.rs @@ -18,7 +18,7 @@ use std::env; use std::borrow::Cow; -use rlog::{LogLevelFilter, LogRecord}; +use rlog::{LogLevelFilter}; use env_logger::LogBuilder; use std::sync::{RwLock, RwLockReadGuard}; use std::sync::atomic::{Ordering, AtomicBool}; @@ -46,12 +46,6 @@ impl> Applyable for T { } } -fn markup(r: &LogRecord) -> String { - let s = format!("{}", r.args()); - println!("{}", s); - s -} - lazy_static! { static ref LOG_DUMMY: bool = { let mut builder = LogBuilder::new(); @@ -61,8 +55,6 @@ lazy_static! { builder.parse(&log); } -// builder.format(markup); - if builder.init().is_ok() { println!("logger initialized"); }