Merge branch 'master' into client-ipc-refact

2016-07-06 14:43:36 +03:00
parent 9783c93564 f8b56317b4
commit b25a37eb38
35 changed files with 383 additions and 27179 deletions
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -180,7 +180,6 @@ pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_numbe
 			db,
 			&last_header,
 			last_hashes.clone(),
-			None,
 			author.clone(),
 			(3141562.into(), 31415620.into()),
 			vec![]