Simplify Peer receive action

Convex-Dev · Jul 10, 2023 · f93f646 · f93f646
1 parent 2837da6
commit f93f646
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/convex-peer/src/main/java/convex/peer/ConnectionManager.java b/convex-peer/src/main/java/convex/peer/ConnectionManager.java
@@ -595,7 +595,7 @@ public Connection connectToPeer(InetSocketAddress hostAddress) {
 			if ((existing!=null)&&!existing.isClosed()) return existing;
 			synchronized(connections) {
 				// reopen with connection to the peer and handle server messages
-				newConn = Connection.connect(hostAddress, server.peerReceiveAction, server.getStore(), null,Config.SOCKET_PEER_BUFFER_SIZE,Config.SOCKET_PEER_BUFFER_SIZE);
+				newConn = Connection.connect(hostAddress, server.receiveAction, server.getStore(), null,Config.SOCKET_PEER_BUFFER_SIZE,Config.SOCKET_PEER_BUFFER_SIZE);
 				connections.put(peerKey, newConn);
 			}
 		} catch (IOException | TimeoutException e) {

diff --git a/convex-peer/src/main/java/convex/peer/Server.java b/convex-peer/src/main/java/convex/peer/Server.java
@@ -84,20 +84,7 @@ public class Server implements Closeable {
 	 * Message Consumer that simply enqueues received client messages received by this peer
 	 * Called on NIO thread: should never block
 	 */
-	Consumer<Message> clientReceiveAction = m->processMessage(m);
-
-	/**
-	 * Message Consumer that simply enqueues received messages back from outbound peer connections
-	 * Called on NIO thread: should never block
-	 */
-	Consumer<Message> peerReceiveAction = msg-> {
-		// We prioritise missing data requests from a Peer we have connected to
-		if (msg.getType()==MessageType.MISSING_DATA) {
-			handleMissingData(msg);
-		} else {
-			processMessage(msg);
-		}
-	};
+	Consumer<Message> receiveAction = m->processMessage(m);
 
 	/**
 	 * Connection manager instance.
@@ -775,7 +762,7 @@ public HashMap<Keyword, Object> getConfig() {
 	 * @return Message consumer
 	 */
 	public Consumer<Message> getReceiveAction() {
-		return clientReceiveAction;
+		return receiveAction;
 	}
 
 	/**