Merge branch 'master' into miner-no-default

Conflicts: ethcore/src/miner/miner.rs parity/main.rs
2016-06-26 22:44:34 +02:00
parent 4ece68349c 516b015325
commit 6bbaced3cd
50 changed files with 380 additions and 215 deletions
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -241,7 +241,7 @@ impl TestBlockChainClient {
 }

 impl MiningBlockChainClient for TestBlockChainClient {
-	fn prepare_open_block(&self, _author: Address, _gas_floor_target: U256, _extra_data: Bytes) -> OpenBlock {
+	fn prepare_open_block(&self, _author: Address, _gas_range_target: (U256, U256), _extra_data: Bytes) -> OpenBlock {
 		unimplemented!();
 	}
 }