From 3af36644c091debea0a0a597badc146cc97a4264 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Fri, 24 Jun 2022 10:26:39 +0100
Subject: [PATCH] Revert "Rewrite of isNotOldPeer predicate, to fix logic
 issue."

This reverts commit d81071f2544ec72807f70892388ae2ddec8dbc8c.
---
 src/main/java/org/qortal/network/Network.java | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/qortal/network/Network.java b/src/main/java/org/qortal/network/Network.java
index 484bd8bb..6bc58bb4 100644
--- a/src/main/java/org/qortal/network/Network.java
+++ b/src/main/java/org/qortal/network/Network.java
@@ -1373,26 +1373,17 @@ public class Network {
                 // We attempted to connect within the last day
                 // but we last managed to connect over a week ago.
                 Predicate<PeerData> isNotOldPeer = peerData -> {
-
-                    // First check if there was a connection attempt within the last day
                     if (peerData.getLastAttempted() == null
                             || peerData.getLastAttempted() < now - OLD_PEER_ATTEMPTED_PERIOD) {
-
-                        // There was, so now check if we had a successful connection in the last 7 days
-                        if (peerData.getLastConnected() == null
-                                || peerData.getLastConnected() > now - OLD_PEER_CONNECTION_PERIOD) {
-
-                            // We did, so this is NOT an 'old' peer
-                            return true;
-                        }
-
-                        // Last successful connection was more than 1 week ago - this is an 'old' peer
-                        return false;
-                    }
-                    else {
-                        // Best to wait until we have a connection attempt - assume not an 'old' peer until then
                         return true;
                     }
+
+                    if (peerData.getLastConnected() == null
+                            || peerData.getLastConnected() > now - OLD_PEER_CONNECTION_PERIOD) {
+                        return true;
+                    }
+
+                    return false;
                 };
 
                 // Disregard peers that are NOT 'old'