status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev/etan/nw-nilpeer' into feat/splitview

This commit is contained in:
Etan Kissling 2024-03-28 01:40:00 +01:00
parent ee80daba2a 95aed2b220
commit e4c4d11480
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
beacon_chain/networking/peer_pool.nim
View File

@ -653,12 +653,12 @@ iterator peers*[A, B](pool: PeerPool[A, B],
## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values ## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values
## will be first. ## will be first.
var sorted = initHeapQueue[PeerIndex]() var sorted = initHeapQueue[PeerIndex]()
for i in 0 ..< len(pool.storage): for peerIdx in pool.registry.values():
if pool.storage[i].peerType in filter: if pool.storage[peerIdx.data].peerType in filter:
sorted.push(PeerIndex(data: i, cmp: pool.cmp)) sorted.push(peerIdx)
while len(sorted) > 0: while len(sorted) > 0:
let pindex = sorted.pop().data let peerIdx = sorted.pop()
yield pool.storage[pindex].data yield pool.storage[peerIdx.data].data
iterator availablePeers*[A, B](pool: PeerPool[A, B], iterator availablePeers*[A, B](pool: PeerPool[A, B],
filter = {PeerType.Incoming, filter = {PeerType.Incoming,
@ -668,13 +668,13 @@ iterator availablePeers*[A, B](pool: PeerPool[A, B],
## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values ## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values
## will be first. ## will be first.
var sorted = initHeapQueue[PeerIndex]() var sorted = initHeapQueue[PeerIndex]()
for i in 0 ..< len(pool.storage): for peerIdx in pool.registry.values():
if (PeerFlags.Acquired notin pool.storage[i].flags) and if (PeerFlags.Acquired notin pool.storage[peerIdx.data].flags) and
(pool.storage[i].peerType in filter): (pool.storage[peerIdx.data].peerType in filter):
sorted.push(PeerIndex(data: i, cmp: pool.cmp)) sorted.push(peerIdx)
while len(sorted) > 0: while len(sorted) > 0:
let pindex = sorted.pop().data let peerIdx = sorted.pop()
yield pool.storage[pindex].data yield pool.storage[peerIdx.data].data
iterator acquiredPeers*[A, B](pool: PeerPool[A, B], iterator acquiredPeers*[A, B](pool: PeerPool[A, B],
filter = {PeerType.Incoming, filter = {PeerType.Incoming,
@ -684,13 +684,13 @@ iterator acquiredPeers*[A, B](pool: PeerPool[A, B],
## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values ## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values
## will be first. ## will be first.
var sorted = initHeapQueue[PeerIndex]() var sorted = initHeapQueue[PeerIndex]()
for i in 0 ..< len(pool.storage): for peerIdx in pool.registry.values():
if (PeerFlags.Acquired in pool.storage[i].flags) and if (PeerFlags.Acquired in pool.storage[peerIdx.data].flags) and
(pool.storage[i].peerType in filter): (pool.storage[peerIdx.data].peerType in filter):
sorted.push(PeerIndex(data: i, cmp: pool.cmp)) sorted.push(peerIdx)
while len(sorted) > 0: while len(sorted) > 0:
let pindex = sorted.pop().data let peerIdx = sorted.pop()
yield pool.storage[pindex].data yield pool.storage[peerIdx.data].data
proc `[]`*[A, B](pool: PeerPool[A, B], key: B): A {.inline, raises: [KeyError].} = proc `[]`*[A, B](pool: PeerPool[A, B], key: B): A {.inline, raises: [KeyError].} =
## Retrieve peer with key ``key`` from PeerPool ``pool``. ## Retrieve peer with key ``key`` from PeerPool ``pool``.