Merge branch 'master' into issues/4673

2017-07-25 09:03:21 +07:00
parent c522f564a9 78fab4e471
commit 8b3ec61151
13 changed files with 694 additions and 43 deletions
--- a/parity/dapps.rs
+++ b/parity/dapps.rs
@@ -188,7 +188,10 @@ mod server {
 	use parity_rpc::{hyper, RequestMiddleware, RequestMiddlewareAction};
 	use rpc_apis;

-	pub type SyncStatus = Fn() -> bool;
+	pub trait SyncStatus {
+		fn is_major_importing(&self) -> bool;
+		fn peers(&self) -> (usize, usize);
+	}

 	pub struct Middleware;
 	impl RequestMiddleware for Middleware {