Merge branch 'master' into txcount-rpc

Conflicts:
	rpc/src/v1/tests/mocked/ethcore.rs

rpc/src/v1/impls/ethcore_set.rs

@@ -16,9 +16,11 @@
 
 /// Ethcore-specific rpc interface for operations altering the settings.
 use util::{U256, Address};
+use util::network::{NetworkService, NonReservedPeerMode};
 use std::sync::{Arc, Weak};
 use jsonrpc_core::*;
 use ethcore::miner::MinerService;
+use ethcore::service::SyncMessage;
 use v1::traits::EthcoreSet;
 use v1::types::{Bytes};
 
@@ -27,13 +29,15 @@ pub struct EthcoreSetClient<M> where
 	M: MinerService {
 
 	miner: Weak<M>,
+	net: Weak<NetworkService<SyncMessage>>,
 }
 
 impl<M> EthcoreSetClient<M> where M: MinerService {
 	/// Creates new `EthcoreSetClient`.
-	pub fn new(miner: &Arc<M>) -> Self {
+	pub fn new(miner: &Arc<M>, net: &Arc<NetworkService<SyncMessage>>) -> Self {
 		EthcoreSetClient {
 			miner: Arc::downgrade(miner),
+			net: Arc::downgrade(net),
 		}
 	}
 }
@@ -74,4 +78,32 @@ impl<M> EthcoreSet for EthcoreSetClient<M> where M: MinerService + 'static {
 			to_value(&true)
 		})
 	}
+
+	fn add_reserved_peer(&self, params: Params) -> Result<Value, Error> {
+		from_params::<(String,)>(params).and_then(|(peer,)| {
+			match take_weak!(self.net).add_reserved_peer(&peer) {
+				Ok(()) => to_value(&true),
+				Err(_) => Err(Error::invalid_params()),
+			}
+		})
+	}
+
+	fn remove_reserved_peer(&self, params: Params) -> Result<Value, Error> {
+		from_params::<(String,)>(params).and_then(|(peer,)| {
+			match take_weak!(self.net).remove_reserved_peer(&peer) {
+				Ok(()) => to_value(&true),
+				Err(_) => Err(Error::invalid_params()),
+			}
+		})
+	}
+
+	fn drop_non_reserved_peers(&self, _: Params) -> Result<Value, Error> {
+		take_weak!(self.net).set_non_reserved_mode(NonReservedPeerMode::Deny);
+		to_value(&true)
+	}
+
+	fn accept_non_reserved_peers(&self, _: Params) -> Result<Value, Error> {
+		take_weak!(self.net).set_non_reserved_mode(NonReservedPeerMode::Accept);
+		to_value(&true)
+	}
 }