revert initial implementation

waku-org · Jul 10, 2024 · 8714beb · 8714beb
1 parent 7520eca
commit 8714beb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/waku/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim
@@ -204,9 +204,7 @@ proc connectRelay*(
 
       waku_peers_dials.inc(labelValues = ["successful"])
       waku_node_conns_initiated.inc(labelValues = [source])
-
       pm.peerStore[NumberFailedConnBook][peerId] = 0
-      pm.peerStore[LastSuccessfulConnBook][peerId] = Moment.init(getTime().toUnix, Second)
 
       return true
 

diff --git a/waku/node/peer_manager/waku_peer_store.nim b/waku/node/peer_manager/waku_peer_store.nim
@@ -1,9 +1,8 @@
 {.push raises: [].}
 
 import
-  std/[tables, sequtils, sets, options, strutils, times, random, math],
+  std/[tables, sequtils, sets, options, strutils],
   chronos,
-  chronos/timer,
   eth/p2p/discoveryv5/enr,
   libp2p/builders,
   libp2p/peerstore
@@ -24,9 +23,6 @@ type
   # Last failed connection attemp timestamp
   LastFailedConnBook* = ref object of PeerBook[Moment]
 
-  # Last Successful connection attemp timestamp
-  LastSuccessfulConnBook* = ref object of PeerBook[Moment]
-
   # Failed connection attempts
   NumberFailedConnBook* = ref object of PeerBook[int]
 
@@ -72,7 +68,6 @@ proc get*(peerStore: PeerStore, peerId: PeerID): RemotePeerInfo =
     origin: peerStore[SourceBook][peerId],
     direction: peerStore[DirectionBook][peerId],
     lastFailedConn: peerStore[LastFailedConnBook][peerId],
-    lastSuccessfulConn: peerStore[LastSuccessfulConnBook][peerId],
     numberFailedConn: peerStore[NumberFailedConnBook][peerId],
   )
 
@@ -145,10 +140,8 @@ proc getPeersByProtocol*(peerStore: PeerStore, proto: string): seq[RemotePeerInf
   return peerStore.peers.filterIt(it.protocols.contains(proto))
 
 proc getReachablePeers*(peerStore: PeerStore): seq[RemotePeerInfo] =
-  let threshold = Moment.fromNow(millis(-3*60*60*1000))
   return peerStore.peers.filterIt(
-    (it.connectedness == CanConnect or it.connectedness == Connected) and
-    (it.lastSuccessfulConn > threshold)
+    (it.connectedness == CanConnect or it.connectedness == Connected)
   )
 
 proc getPeersByShard*(

diff --git a/waku/waku_core/peers.nim b/waku/waku_core/peers.nim
@@ -54,7 +54,6 @@ type RemotePeerInfo* = ref object
   origin*: PeerOrigin
   direction*: PeerDirection
   lastFailedConn*: Moment
-  lastSuccessfulConn*: Moment
   numberFailedConn*: int
 
 func `$`*(remotePeerInfo: RemotePeerInfo): string =