grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix test.

Browse Source
This commit is contained in:
Gav Wood 2016-07-09 16:39:59 +02:00
parent 9a70f717ad
commit 172553c81e
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/v1/tests/eth.rs
View File

@ -64,7 +64,7 @@ fn miner_service(spec: Spec, accounts: Arc<AccountProvider>) -> Arc<Miner> {
work_queue_size: 50, work_queue_size: 50,
enable_resubmission: true, enable_resubmission: true,
}, },
GasPricer::new_fixed(20000000000), GasPricer::new_fixed(20_000_000_000u64.into()),
spec, spec,
Some(accounts) Some(accounts)
) )

10
util/src/log.rs
View File

@ -18,7 +18,7 @@
use std::env; use std::env;
use std::borrow::Cow; use std::borrow::Cow;
use rlog::{LogLevelFilter, LogRecord}; use rlog::{LogLevelFilter};
use env_logger::LogBuilder; use env_logger::LogBuilder;
use std::sync::{RwLock, RwLockReadGuard}; use std::sync::{RwLock, RwLockReadGuard};
use std::sync::atomic::{Ordering, AtomicBool}; use std::sync::atomic::{Ordering, AtomicBool};
@ -46,12 +46,6 @@ impl<T: AsRef<str>> Applyable for T {
} }
} }
fn markup(r: &LogRecord) -> String {
let s = format!("{}", r.args());
println!("{}", s);
s
}
lazy_static! { lazy_static! {
static ref LOG_DUMMY: bool = { static ref LOG_DUMMY: bool = {
let mut builder = LogBuilder::new(); let mut builder = LogBuilder::new();
@ -61,8 +55,6 @@ lazy_static! {
builder.parse(&log); builder.parse(&log);
} }
// builder.format(markup);
if builder.init().is_ok() { if builder.init().is_ok() {
println!("logger initialized"); println!("logger initialized");
} }