Clean-up

waku-org · Sep 15, 2023 · bd83280 · bd83280
1 parent 4420b45
commit bd83280
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
@@ -490,7 +490,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
       if msg.contentTopic == chat.contentTopic:
         chat.printReceivedMessage(msg)
 
-    await node.subscribe(some(DefaultPubsubTopic), @[ContentTopic("")], handler)
+    node.subscribe((kind: PubsubSub, topic: DefaultPubsubTopic), some(handler))
 
     if conf.rlnRelay:
       info "WakuRLNRelay is enabled"

diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim
@@ -49,6 +49,7 @@ import
   ../../waku/node/rest/debug/handlers as rest_debug_api,
   ../../waku/node/rest/relay/handlers as rest_relay_api,
   ../../waku/node/rest/filter/handlers as rest_filter_api,
+  ../../waku/node/rest/filter/legacy_handlers as rest_legacy_filter_api,
   ../../waku/node/rest/store/handlers as rest_store_api,
   ../../waku/node/rest/health/handlers as rest_health_api,
   ../../waku/node/jsonrpc/admin/handlers as rpc_admin_api,

diff --git a/tests/wakunode_rest/test_rest_filter.nim b/tests/wakunode_rest/test_rest_filter.nim
@@ -23,7 +23,6 @@ import
   ../../waku/waku_relay,
   ../../waku/waku_filter_v2/subscriptions,
   ../../waku/waku_filter_v2/common,
-  ../../waku/node/rest/relay/topic_cache,
   ../../waku/node/rest/relay/handlers as relay_api,
   ../../waku/node/rest/relay/client as relay_api_client,
   ../testlib/wakucore,
@@ -74,7 +73,7 @@ proc init(T: type RestFilterTest): Future[T] {.async.} =
   testSetup.messageCache = filter_api.MessageCache.init()
   installFilterRestApiHandlers(testSetup.restServer.router, testSetup.subscriberNode, testSetup.messageCache)
 
-  let topicCache = TopicCache.init()
+  let topicCache = MessageCache[string].init()
   installRelayApiHandlers(testSetup.restServerForService.router, testSetup.serviceNode, topicCache)
 
   testSetup.restServer.start()
@@ -244,7 +243,7 @@ suite "Waku v2 Rest API - Filter V2":
       subPeerId = restFilterTest.subscriberNode.peerInfo.toRemotePeerInfo().peerId
 
     restFilterTest.messageCache.subscribe(DefaultPubsubTopic)
-    restFilterTest.serviceNode.subscribe(DefaultPubsubTopic)
+    restFilterTest.serviceNode.subscribe((kind: PubsubSub, topic: DefaultPubsubTopic))
 
     # When
     var requestBody = FilterSubscribeRequest(requestId: "1234",

diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
@@ -43,8 +43,7 @@ import
   ../waku_rln_relay,
   ./config,
   ./peer_manager,
-  ./waku_switch,
-  ./rest/relay/topic_cache
+  ./waku_switch
 
 
 declarePublicCounter waku_node_messages, "number of messages received", ["type"]