Merge remote-tracking branch 'origin/master' into consistent-id

2016-12-10 13:36:30 +01:00
parent 5f1fcf95e0 6eb63a7316
commit 82efa2675e
91 changed files with 2514 additions and 525 deletions
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -92,8 +92,8 @@ pub struct TestBlockChainClient {
 	pub first_block: RwLock<Option<(H256, u64)>>,
 }

-#[derive(Clone)]
 /// Used for generating test client blocks.
+#[derive(Clone)]
 pub enum EachBlockWith {
 	/// Plain block.
 	Nothing,