Merge branch 'master' of github.com:gavofyork/ethcore into network

src/sync/io.rs

@@ -0,0 +1,43 @@
+use client::BlockChainClient;
+use util::network::{HandlerIo, PeerId, PacketId, Error as NetworkError};
+
+pub trait SyncIo {
+	fn disable_peer(&mut self, peer_id: &PeerId);
+	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>;
+	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>;
+	fn chain<'s>(&'s mut self) -> &'s mut BlockChainClient;
+}
+
+pub struct NetSyncIo<'s, 'h> where 'h:'s {
+	network: &'s mut HandlerIo<'h>,
+	chain: &'s mut BlockChainClient
+}
+
+impl<'s, 'h> NetSyncIo<'s, 'h> {
+	pub fn new(network: &'s mut HandlerIo<'h>, chain: &'s mut BlockChainClient) -> NetSyncIo<'s,'h> {
+		NetSyncIo {
+			network: network,
+			chain: chain,
+		}
+	}
+}
+
+impl<'s, 'h> SyncIo for NetSyncIo<'s, 'h> {
+	fn disable_peer(&mut self, peer_id: &PeerId) {
+		self.network.disable_peer(*peer_id);
+	}
+
+	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>{
+		self.network.respond(packet_id, data)
+	}
+
+	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>{
+		self.network.send(peer_id, packet_id, data)
+	}
+
+	fn chain<'a>(&'a mut self) -> &'a mut BlockChainClient {
+		self.chain
+	}
+}
+
+

src/sync/mod.rs

@@ -12,11 +12,11 @@
 /// use util::network::NetworkService;
 /// use ethcore::client::Client;
 /// use ethcore::sync::EthSync;
-/// use ethcore::spec::Spec;
+/// use ethcore::ethereum;
 ///
 /// fn main() {
 /// 	let mut service = NetworkService::start().unwrap();
-///		let frontier = Spec::new_frontier();
+///		let frontier = ethereum::new_frontier();
 /// 	let dir = env::temp_dir();
 /// 	let client = Arc::new(Client::new(&frontier.genesis_block(), &dir));
 /// 	EthSync::register(&mut service, client);