Merge branch 'master' into mining

2016-03-01 16:59:39 +01:00
parent a5c65b2a3d bbe2e8076b
commit f705f6957a
13 changed files with 734 additions and 34 deletions
--- a/sync/src/tests/helpers.rs
+++ b/sync/src/tests/helpers.rs
@@ -117,7 +117,7 @@ impl BlockChainClient for TestBlockChainClient {
 		unimplemented!();
 	}

-	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
+	fn logs(&self, _filter: Filter) -> Vec<LocalizedLogEntry> {
 		unimplemented!();
 	}