Fixed errors after merge with master

2017-07-27 19:15:25 +02:00
parent f2d12aebef
commit 45043c3f52
8 changed files with 9 additions and 15 deletions
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -25,8 +25,7 @@ use evm::Schedule;
 use header::BlockNumber;
 use error::Error;
 use state::CleanupMode;
-use trace::{Tracer, ExecutiveTracer};
-use types::trace_types::trace::{RewardType};
+use trace::{Tracer, ExecutiveTracer, RewardType};

 /// An engine which does not provide any consensus mechanism and does not seal blocks.
 pub struct NullEngine {