chore: better naming converntion

waku-org · Jun 28, 2024 · 9dfa363 · 9dfa363
1 parent dd3ea78
commit 9dfa363
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/tests/wakunode_rest/test_rest_filter.nim b/tests/wakunode_rest/test_rest_filter.nim
@@ -53,7 +53,7 @@ proc init(T: type RestFilterTest): Future[T] {.async.} =
   await allFutures(testSetup.serviceNode.start(), testSetup.subscriberNode.start())
 
   await testSetup.serviceNode.mountRelay()
-  await testSetup.serviceNode.mountFilter(cacheTTL = 1.seconds)
+  await testSetup.serviceNode.mountFilter(messageCacheTTL = 1.seconds)
   await testSetup.subscriberNode.mountFilterClient()
 
   testSetup.subscriberNode.peerManager.addServicePeer(

diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
@@ -437,14 +437,14 @@ proc mountFilter*(
       filter_subscriptions.DefaultSubscriptionTimeToLiveSec,
     maxFilterPeers: uint32 = filter_subscriptions.MaxFilterPeers,
     maxFilterCriteriaPerPeer: uint32 = filter_subscriptions.MaxFilterCriteriaPerPeer,
-    cacheTTL: Duration = 2.minutes,
+    messageCacheTTL: Duration = filter_subscriptions.MessageCacheTTL,
 ) {.async: (raises: []).} =
   ## Mounting filter v2 protocol
 
   info "mounting filter protocol"
   node.wakuFilter = WakuFilter.new(
     node.peerManager, subscriptionTimeout, maxFilterPeers, maxFilterCriteriaPerPeer,
-    cacheTTL,
+    messageCacheTTL,
   )
 
   if node.started:

diff --git a/waku/waku_filter_v2/protocol.nim b/waku/waku_filter_v2/protocol.nim
@@ -298,14 +298,14 @@ proc new*(
     subscriptionTimeout: Duration = DefaultSubscriptionTimeToLiveSec,
     maxFilterPeers: uint32 = MaxFilterPeers,
     maxFilterCriteriaPerPeer: uint32 = MaxFilterCriteriaPerPeer,
-    cacheTTL: Duration = 2.minutes,
+    messageCacheTTL: Duration = MessageCacheTTL,
 ): T =
   let wf = WakuFilter(
     subscriptions: FilterSubscriptions.init(
       subscriptionTimeout, maxFilterPeers, maxFilterCriteriaPerPeer
     ),
     peerManager: peerManager,
-    messageCache: init(TimedCache[string], cacheTTL),
+    messageCache: init(TimedCache[string], messageCacheTTL),
   )
 
   wf.initProtocolHandler()

diff --git a/waku/waku_filter_v2/subscriptions.nim b/waku/waku_filter_v2/subscriptions.nim
@@ -13,6 +13,7 @@ const
   MaxFilterPeers* = 1000
   MaxFilterCriteriaPerPeer* = 1000
   DefaultSubscriptionTimeToLiveSec* = 5.minutes
+  MessageCacheTTL* = 2.minutes
 
 type
   # a single filter criterion is fully defined by a pubsub topic and content topic