Merge branch 'master' into Fix-4858

2017-08-29 15:11:05 +02:00
parent bfd238e000 d520aa2633
commit 50495c6898
275 changed files with 6719 additions and 3562 deletions
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -67,7 +67,7 @@ impl Engine for NullEngine {
 	}

 	fn snapshot_components(&self) -> Option<Box<::snapshot::SnapshotComponents>> {
-		Some(Box::new(::snapshot::PowSnapshot(10000)))
+		Some(Box::new(::snapshot::PowSnapshot::new(10000, 10000)))
 	}

 	fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {