From f35fa7d18d9e0f51bed311355ec1310b1d311ab3 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 21 Jul 2022 17:34:53 +0200
Subject: Move things around

---
 src/peering/basalt.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/peering/basalt.rs')

diff --git a/src/peering/basalt.rs b/src/peering/basalt.rs
index 7f77995..98977a3 100644
--- a/src/peering/basalt.rs
+++ b/src/peering/basalt.rs
@@ -14,8 +14,9 @@ use sodiumoxide::crypto::hash;
 use tokio::sync::watch;
 
 use crate::endpoint::*;
+use crate::message::*;
 use crate::netapp::*;
-use crate::proto::*;
+use crate::send::*;
 use crate::NodeID;
 
 // -- Protocol messages --
-- 
cgit v1.2.3


From 7d148c7e764d563efa3bccc0f14f50867db38ef1 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 21 Jul 2022 19:25:07 +0200
Subject: One possibility, but I don't like it

---
 src/peering/basalt.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/peering/basalt.rs')

diff --git a/src/peering/basalt.rs b/src/peering/basalt.rs
index 98977a3..d7bc6a8 100644
--- a/src/peering/basalt.rs
+++ b/src/peering/basalt.rs
@@ -16,7 +16,6 @@ use tokio::sync::watch;
 use crate::endpoint::*;
 use crate::message::*;
 use crate::netapp::*;
-use crate::send::*;
 use crate::NodeID;
 
 // -- Protocol messages --
@@ -332,7 +331,7 @@ impl Basalt {
 	async fn do_pull(self: Arc<Self>, peer: NodeID) {
 		match self
 			.pull_endpoint
-			.call(&peer, &PullMessage {}, PRIO_NORMAL)
+			.call(&peer, PullMessage {}, PRIO_NORMAL)
 			.await
 		{
 			Ok(resp) => {
@@ -347,7 +346,7 @@ impl Basalt {
 
 	async fn do_push(self: Arc<Self>, peer: NodeID) {
 		let push_msg = self.make_push_message();
-		match self.push_endpoint.call(&peer, &push_msg, PRIO_NORMAL).await {
+		match self.push_endpoint.call(&peer, push_msg, PRIO_NORMAL).await {
 			Ok(_) => {
 				trace!("KYEV PEXo {}", hex::encode(peer));
 			}
@@ -469,14 +468,14 @@ impl Basalt {
 
 #[async_trait]
 impl EndpointHandler<PullMessage> for Basalt {
-	async fn handle(self: &Arc<Self>, _pullmsg: &PullMessage, _from: NodeID) -> PushMessage {
+	async fn handle(self: &Arc<Self>, _pullmsg: PullMessage, _from: NodeID) -> PushMessage {
 		self.make_push_message()
 	}
 }
 
 #[async_trait]
 impl EndpointHandler<PushMessage> for Basalt {
-	async fn handle(self: &Arc<Self>, pushmsg: &PushMessage, _from: NodeID) {
+	async fn handle(self: &Arc<Self>, pushmsg: PushMessage, _from: NodeID) {
 		self.handle_peer_list(&pushmsg.peers[..]);
 	}
 }
-- 
cgit v1.2.3


From 4934ed726d51913afd97ca937d0ece39ef8b7371 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 21 Jul 2022 20:22:56 +0200
Subject: Propose alternative API

---
 src/peering/basalt.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/peering/basalt.rs')

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(())
 	}
 }
 
-- 
cgit v1.2.3


From c358fe3c92da8a8454e461484737efe2a14dfd73 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 22 Jul 2022 10:55:37 +0200
Subject: Hide streaming versions as much as possible

---
 src/peering/basalt.rs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/peering/basalt.rs')

diff --git a/src/peering/basalt.rs b/src/peering/basalt.rs
index 71dea84..310077f 100644
--- a/src/peering/basalt.rs
+++ b/src/peering/basalt.rs
@@ -468,24 +468,15 @@ impl Basalt {
 
 #[async_trait]
 impl EndpointHandler<PullMessage> for Basalt {
-	async fn handle(
-		self: &Arc<Self>,
-		_pullmsg: Req<PullMessage>,
-		_from: NodeID,
-	) -> Resp<PullMessage> {
-		Resp::new(self.make_push_message())
+	async fn handle(self: &Arc<Self>, _pullmsg: &PullMessage, _from: NodeID) -> PushMessage {
+		self.make_push_message()
 	}
 }
 
 #[async_trait]
 impl EndpointHandler<PushMessage> for Basalt {
-	async fn handle(
-		self: &Arc<Self>,
-		pushmsg: Req<PushMessage>,
-		_from: NodeID,
-	) -> Resp<PushMessage> {
-		self.handle_peer_list(&pushmsg.msg().peers[..]);
-		Resp::new(())
+	async fn handle(self: &Arc<Self>, pushmsg: &PushMessage, _from: NodeID) {
+		self.handle_peer_list(&pushmsg.peers[..]);
 	}
 }
 
-- 
cgit v1.2.3