Merge branch 'master' into util_error_chain

2017-09-05 14:58:35 +02:00
parent 0a71ee95af 899538ae25
commit 14d00a7f72
92 changed files with 2464 additions and 2652 deletions
--- a/ethcore/src/snapshot/tests/proof_of_authority.rs
+++ b/ethcore/src/snapshot/tests/proof_of_authority.rs
@@ -93,7 +93,7 @@ fn make_chain(accounts: Arc<AccountProvider>, blocks_beyond: usize, transitions:
 	let mut cur_signers = vec![*RICH_ADDR];
 	{
 		let engine = client.engine();
-		engine.register_client(Arc::downgrade(&client) as _);
+		engine.register_client(Arc::downgrade(&client));
 	}

 	{