Merge branch 'master' of github.com:ethcore/parity into trace_err

2016-05-19 01:03:55 +02:00
parent 8f6febae18 6cff58055d
commit 55ebab2392
38 changed files with 241 additions and 202 deletions
--- a/ethcore/src/trace/db.rs
+++ b/ethcore/src/trace/db.rs
@@ -22,7 +22,7 @@ use std::sync::{RwLock, Arc};
 use std::path::Path;
 use bloomchain::{Number, Config as BloomConfig};
 use bloomchain::group::{BloomGroupDatabase, BloomGroupChain, GroupPosition, BloomGroup};
-use util::{FixedHash, H256, H264, Database, DBTransaction};
+use util::{H256, H264, Database, DBTransaction};
 use header::BlockNumber;
 use trace::{BlockTraces, LocalizedTrace, Config, Switch, Filter, Database as TraceDatabase, ImportRequest,
 DatabaseExtras, Error};