From 9658f0cdd4f1bb8fd573982e083aec37b5447028 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 21 Aug 2022 12:18:40 +0100
Subject: [PATCH] Revert "Rewrite of isNotOldPeer predicate, to fix logic
 issue."

This rewrite may have been causing problems with connections in the network, due to peers being forgotten too easily. Reverting for now to see if it solves the problem.

This reverts commit d81071f2544ec72807f70892388ae2ddec8dbc8c.

# Conflicts:
#	src/main/java/org/qortal/network/Network.java
---
 src/main/java/org/qortal/network/Network.java | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/qortal/network/Network.java b/src/main/java/org/qortal/network/Network.java
index 10f02d52..57073e99 100644
--- a/src/main/java/org/qortal/network/Network.java
+++ b/src/main/java/org/qortal/network/Network.java
@@ -1375,26 +1375,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
+                    if (peerData.getLastAttempted() == null
+                            || peerData.getLastAttempted() < now - OLD_PEER_ATTEMPTED_PERIOD) {
                         return true;
                     }
+
+                    if (peerData.getLastConnected() == null
+                            || peerData.getLastConnected() > now - OLD_PEER_CONNECTION_PERIOD) {
+                        return true;
+                    }
+
+                    return false;
                 };
 
                 // Disregard peers that are NOT 'old'