waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

filter: some adjustments to avoid crash and use new insteat init

This commit is contained in:
Ivan Folgueira Bande 2024-12-05 20:30:38 +01:00
parent 26a2112c5d
commit b9931e277d
No known key found for this signature in database
GPG Key ID: 3C117481F89E24A7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waku/waku_filter_v2/protocol.nim
View File

@ -330,7 +330,7 @@ proc new*(
rateLimitSetting: Option[RateLimitSetting] = none[RateLimitSetting](), rateLimitSetting: Option[RateLimitSetting] = none[RateLimitSetting](),
): T = ): T =
let wf = WakuFilter( let wf = WakuFilter(
subscriptions: FilterSubscriptions.init( subscriptions: FilterSubscriptions.new(
subscriptionTimeout, maxFilterPeers, maxFilterCriteriaPerPeer subscriptionTimeout, maxFilterPeers, maxFilterCriteriaPerPeer
), ),
peerManager: peerManager, peerManager: peerManager,

4
waku/waku_filter_v2/subscriptions.nim
View File

@ -40,7 +40,7 @@ type
maxPeers: uint maxPeers: uint
maxCriteriaPerPeer: uint maxCriteriaPerPeer: uint
proc init*( proc new*(
T: type FilterSubscriptions, T: type FilterSubscriptions,
subscriptionTimeout: Duration = DefaultSubscriptionTimeToLiveSec, subscriptionTimeout: Duration = DefaultSubscriptionTimeToLiveSec,
maxFilterPeers: uint32 = MaxFilterPeers, maxFilterPeers: uint32 = MaxFilterPeers,
@ -172,6 +172,8 @@ proc addSubscription*(
let newPeerData: PeerData = let newPeerData: PeerData =
(lastSeen: Moment.now(), criteriaCount: 0, connection: connRes.get()) (lastSeen: Moment.now(), criteriaCount: 0, connection: connRes.get())
peerData = addr(s.peersSubscribed.mgetOrPut(peerId, newPeerData))
for filterCriterion in filterCriteria: for filterCriterion in filterCriteria:
var peersOfSub = addr(s.subscriptions.mgetOrPut(filterCriterion, SubscribedPeers())) var peersOfSub = addr(s.subscriptions.mgetOrPut(filterCriterion, SubscribedPeers()))
if peerId notin peersOfSub[]: if peerId notin peersOfSub[]: