Propose alternative API

2 files changed, 20 insertions, 9 deletions

diff --git a/src/peering/basalt.rs b/src/peering/basalt.rs
index d7bc6a8..71dea84 100644
--- a/src/peering/basalt.rs
+++ b/src/peering/basalt.rs
@@ -468,15 +468,24 @@ impl Basalt {
 
 #[async_trait]
 impl EndpointHandler<PullMessage> for Basalt {
-	async fn handle(self: &Arc<Self>, _pullmsg: PullMessage, _from: NodeID) -> PushMessage {
-		self.make_push_message()
+	async fn handle(
+		self: &Arc<Self>,
+		_pullmsg: Req<PullMessage>,
+		_from: NodeID,
+	) -> Resp<PullMessage> {
+		Resp::new(self.make_push_message())
 	}
 }
 
 #[async_trait]
 impl EndpointHandler<PushMessage> for Basalt {
-	async fn handle(self: &Arc<Self>, pushmsg: PushMessage, _from: NodeID) {
-		self.handle_peer_list(&pushmsg.peers[..]);
+	async fn handle(
+		self: &Arc<Self>,
+		pushmsg: Req<PushMessage>,
+		_from: NodeID,
+	) -> Resp<PushMessage> {
+		self.handle_peer_list(&pushmsg.msg().peers[..]);
+		Resp::new(())
 	}
 }
 
diff --git a/src/peering/fullmesh.rs b/src/peering/fullmesh.rs
index f8348af..9b7b666 100644
--- a/src/peering/fullmesh.rs
+++ b/src/peering/fullmesh.rs
@@ -583,13 +583,14 @@ impl FullMeshPeeringStrategy {
 
 #[async_trait]
 impl EndpointHandler<PingMessage> for FullMeshPeeringStrategy {
-	async fn handle(self: &Arc<Self>, ping: PingMessage, from: NodeID) -> PingMessage {
+	async fn handle(self: &Arc<Self>, ping: Req<PingMessage>, from: NodeID) -> Resp<PingMessage> {
+		let ping = ping.msg();
 		let ping_resp = PingMessage {
 			id: ping.id,
 			peer_list_hash: self.known_hosts.read().unwrap().hash,
 		};
 		debug!("Ping from {}", hex::encode(&from[..8]));
-		ping_resp
+		Resp::new(ping_resp)
 	}
 }
 
@@ -597,11 +598,12 @@ impl EndpointHandler<PingMessage> for FullMeshPeeringStrategy {
 impl EndpointHandler<PeerListMessage> for FullMeshPeeringStrategy {
 	async fn handle(
 		self: &Arc<Self>,
-		peer_list: PeerListMessage,
+		peer_list: Req<PeerListMessage>,
 		_from: NodeID,
-	) -> PeerListMessage {
+	) -> Resp<PeerListMessage> {
+		let peer_list = peer_list.msg();
 		self.handle_peer_list(&peer_list.list[..]);
 		let peer_list = KnownHosts::map_into_vec(&self.known_hosts.read().unwrap().list);
-		PeerListMessage { list: peer_list }
+		Resp::new(PeerListMessage { list: peer_list })
 	}
 }