From 6ae03e5bc756be7a3139e126abeb72ddfafe24ab Mon Sep 17 00:00:00 2001 From: Kim De Mey Date: Wed, 2 Sep 2020 16:52:00 +0200 Subject: [PATCH] Remove filter parts from relay as this is obsolete (moved to WakuNode) (#132) --- waku/node/v2/wakunode2.nim | 3 --- waku/protocol/v2/waku_relay.nim | 11 +++-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/waku/node/v2/wakunode2.nim b/waku/node/v2/wakunode2.nim index 54920435e..53207f0a3 100644 --- a/waku/node/v2/wakunode2.nim +++ b/waku/node/v2/wakunode2.nim @@ -129,9 +129,6 @@ proc start*(node: WakuNode) {.async.} = let storeProto = WakuStore.init() node.switch.mount(storeProto) - let wakuRelay = cast[WakuRelay](node.switch.pubSub.get()) - wakuRelay.addFilter("store", storeProto.filter()) - # TODO Get this from WakuNode obj let peerInfo = node.peerInfo let id = peerInfo.peerId.pretty diff --git a/waku/protocol/v2/waku_relay.nim b/waku/protocol/v2/waku_relay.nim index 1e858a7e7..79905d6cb 100644 --- a/waku/protocol/v2/waku_relay.nim +++ b/waku/protocol/v2/waku_relay.nim @@ -4,13 +4,11 @@ ## Instead, it should likely be on top of GossipSub with a similar interface. import - std/[strutils, tables], + std/strutils, chronos, chronicles, metrics, - libp2p/protocols/pubsub/[pubsub, pubsubpeer, floodsub, gossipsub], + libp2p/protocols/pubsub/[pubsub, floodsub, gossipsub], libp2p/protocols/pubsub/rpc/messages, - libp2p/stream/connection, - ../../node/v2/waku_types, - ./filter + libp2p/stream/connection declarePublicGauge total_messages, "number of messages received" @@ -93,6 +91,3 @@ method stop*(w: WakuRelay) {.async.} = await procCall GossipSub(w).stop() else: await procCall FloodSub(w).stop() - -proc addFilter*(w: WakuRelay, name: string, filter: Filter) = - w.filters.subscribe(name, filter)