From 5d4fa3ce7395d0fe902182c9d67ffbf31adda76f Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande
 <128452529+Ivansete-status@users.noreply.github.com>
Date: Tue, 20 Jun 2023 13:14:17 +0200
Subject: [PATCH] Deprecation of the 'topics' param (#1806)

---
 apps/wakunode2/app.nim    | 13 +------------
 apps/wakunode2/config.nim |  5 -----
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim
index b5a010dd2..b169dc406 100644
--- a/apps/wakunode2/app.nim
+++ b/apps/wakunode2/app.nim
@@ -502,18 +502,7 @@ proc setupProtocols(node: WakuNode, conf: WakuNodeConf,
     peerExchangeHandler = some(handlePeerExchange)
 
   if conf.relay:
-
-    var pubsubTopics = @[""]
-    if conf.topicsDeprecated != "/waku/2/default-waku/proto":
-      warn "The 'topics' parameter is deprecated. Better use the 'topic' one instead."
-      if conf.topics != @["/waku/2/default-waku/proto"]:
-        return err("Please don't specify 'topics' and 'topic' simultaneously. Only use the 'topic' parameter")
-
-      # This clause (if conf.topicsDeprecated ) should disapear in >= v0.18.0
-      pubsubTopics = conf.topicsDeprecated.split(" ")
-    else:
-      pubsubTopics = conf.topics
-
+    let pubsubTopics = conf.topics
     try:
       await mountRelay(node, pubsubTopics, peerExchangeHandler = peerExchangeHandler)
     except CatchableError:
diff --git a/apps/wakunode2/config.nim b/apps/wakunode2/config.nim
index a26851031..e04fcce29 100644
--- a/apps/wakunode2/config.nim
+++ b/apps/wakunode2/config.nim
@@ -215,11 +215,6 @@ type
       defaultValue: false
       name: "keep-alive" }: bool
 
-    topicsDeprecated* {.
-      desc: "Default topics to subscribe to (space separated list). DEPRECATED: please use repeated --topic argument instead."
-      defaultValue: "/waku/2/default-waku/proto"
-      name: "topics" .}: string
-
     topics* {.
       desc: "Default topic to subscribe to. Argument may be repeated."
       defaultValue: @["/waku/2/default-waku/proto"]