Merge remote-tracking branch 'parity/master' into bft

Conflicts: ethcore/src/client/client.rs
2016-10-05 14:57:14 +01:00
parent 096b71feb2 1782b659d1
commit 1f56588b87
89 changed files with 1867 additions and 763 deletions
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -98,7 +98,6 @@ impl EthSync {
 	}
 }

-#[derive(Ipc)]
 #[ipc(client_ident="SyncClient")]
 impl SyncProvider for EthSync {
 	/// Get sync status
@@ -232,7 +231,6 @@ pub trait ManageNetwork : Send + Sync {
 }


-#[derive(Ipc)]
 #[ipc(client_ident="NetworkManagerClient")]
 impl ManageNetwork for EthSync {
 	fn accept_unreserved_peers(&self) {