fix: len usage

waku-org · Feb 9, 2024 · 69bd411 · 69bd411
1 parent ea8dd11
commit 69bd411
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/waku/waku_rln_relay/group_manager/group_manager_base.nim b/waku/waku_rln_relay/group_manager/group_manager_base.nim
@@ -127,7 +127,7 @@ method onWithdraw*(g: GroupManager, cb: OnWithdrawCallback) {.base,gcsafe.} =
 
 proc slideRootQueue*(rootQueue: var Deque[MerkleNode], root: MerkleNode): seq[MerkleNode] =
   ## updates the root queue with the latest root and pops the oldest one when the capacity of `AcceptableRootWindowSize` is reached
-  let overflowCount = rootQueue.len() - AcceptableRootWindowSize + 1
+  let overflowCount = rootQueue.len - AcceptableRootWindowSize + 1
   var overflowedRoots = newSeq[MerkleNode]()
   if overflowCount > 0:
     # Delete the oldest `overflowCount` roots in the deque (index 0..`overflowCount`)

diff --git a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
@@ -153,7 +153,7 @@ when defined(rln_v2):
 
     if g.registerCb.isSome():
       var membersSeq = newSeq[Membership]()
-      for i in 0 ..< rateCommitments.len():
+      for i in 0 ..< rateCommitments.len:
         var index = start + MembershipIndex(i)
         trace "registering member", rateCommitment = rateCommitments[i], index = index
         let member = Membership(rateCommitment: rateCommitments[i], index: index)
@@ -181,7 +181,7 @@ else:
 
     if g.registerCb.isSome():
       var membersSeq = newSeq[Membership]()
-      for i in 0 ..< idCommitments.len():
+      for i in 0 ..< idCommitments.len:
         var index = start + MembershipIndex(i)
         trace "registering member", idCommitment = idCommitments[i], index = index
         let member = Membership(idCommitment: idCommitments[i], index: index)
@@ -213,14 +213,14 @@ when defined(rln_v2):
     initializedGuard(g)
 
     await g.atomicBatch(g.latestIndex, rateCommitments)
-    g.latestIndex += MembershipIndex(rateCommitments.len())
+    g.latestIndex += MembershipIndex(rateCommitments.len)
 else:
   method registerBatch*(g: OnchainGroupManager, 
                         idCommitments: seq[IDCommitment]): Future[void] {.async: (raises: [Exception]).} =
     initializedGuard(g)
 
     await g.atomicBatch(g.latestIndex, idCommitments)
-    g.latestIndex += MembershipIndex(idCommitments.len())
+    g.latestIndex += MembershipIndex(idCommitments.len)
 
 
 when defined(rln_v2):
@@ -437,14 +437,14 @@ proc handleEvents(g: OnchainGroupManager,
         await g.atomicBatch(start = startIndex,
                             rateCommitments = rateCommitments,
                             toRemoveIndices = removalIndices)
-        g.latestIndex = startIndex + MembershipIndex(rateCommitments.len())
+        g.latestIndex = startIndex + MembershipIndex(rateCommitments.len)
         trace "new members added to the Merkle tree", commitments=rateCommitments
       else:
         let idCommitments = members.mapIt(it[0].idCommitment)
         await g.atomicBatch(start = startIndex,
                             idCommitments = idCommitments,
                             toRemoveIndices = removalIndices)
-        g.latestIndex = startIndex + MembershipIndex(idCommitments.len())
+        g.latestIndex = startIndex + MembershipIndex(idCommitments.len)
         trace "new members added to the Merkle tree", commitments=idCommitments
     except CatchableError:
       error "failed to insert members into the tree", error=getCurrentExceptionMsg()

diff --git a/waku/waku_rln_relay/group_manager/static/group_manager.nim b/waku/waku_rln_relay/group_manager/static/group_manager.nim
@@ -34,7 +34,7 @@ method init*(g: StaticGroupManager): Future[void] {.async.} =
 
   discard g.slideRootQueue()
 
-  g.latestIndex += MembershipIndex(idCommitments.len() - 1)
+  g.latestIndex += MembershipIndex(idCommitments.len - 1)
 
   g.initialized = true
 
@@ -74,13 +74,13 @@ when defined(rln_v2):
 
     if g.registerCb.isSome():
       var memberSeq = newSeq[Membership]()
-      for i in 0..<rateCommitments.len():
+      for i in 0..<rateCommitments.len:
         memberSeq.add(Membership(rateCommitment: rateCommitments[i], index: g.latestIndex + MembershipIndex(i) + 1))
       await g.registerCb.get()(memberSeq)
 
     discard g.slideRootQueue()
 
-    g.latestIndex += MembershipIndex(rateCommitments.len())
+    g.latestIndex += MembershipIndex(rateCommitments.len)
 
     return
 else:
@@ -94,13 +94,13 @@ else:
 
     if g.registerCb.isSome():
       var memberSeq = newSeq[Membership]()
-      for i in 0..<idCommitments.len():
+      for i in 0..<idCommitments.len:
         memberSeq.add(Membership(idCommitment: idCommitments[i], index: g.latestIndex + MembershipIndex(i) + 1))
       await g.registerCb.get()(memberSeq)
 
     discard g.slideRootQueue()
 
-    g.latestIndex += MembershipIndex(idCommitments.len())
+    g.latestIndex += MembershipIndex(idCommitments.len)
 
     return
 
@@ -116,7 +116,7 @@ else:
 
     let groupKeys = g.groupKeys
 
-    for i in 0..<groupKeys.len():
+    for i in 0..<groupKeys.len:
       if groupKeys[i].idSecretHash == idSecretHash:
           let idCommitment = groupKeys[i].idCommitment
           let index = MembershipIndex(i)