From 2ec9809cf31b202ee705d337cf3384fe0f7374f4 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande
 <128452529+Ivansete-status@users.noreply.github.com>
Date: Fri, 12 May 2023 13:37:54 +0200
Subject: [PATCH] fix: wakunode2 config. adding new 'topic' config parameter.
 (#1727)

* wakunode2 config. adding new 'topic' config parameter.

This new parameter can be repeated and we are starting to deprecate the
parameter 'topics', that expected to receive a space-separated list of
pubsubtopic to subscribe to.

* Appying PR suggestions
---
 apps/wakunode2/app.nim    | 12 +++++++++++-
 apps/wakunode2/config.nim | 11 +++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim
index 6e111c84c..9e5e84b00 100644
--- a/apps/wakunode2/app.nim
+++ b/apps/wakunode2/app.nim
@@ -547,7 +547,17 @@ proc setupProtocols(node: WakuNode, conf: WakuNodeConf,
     peerExchangeHandler = some(handlePeerExchange)
 
   if conf.relay:
-    let pubsubTopics = conf.topics.split(" ")
+
+    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
     try:
       await mountRelay(node, pubsubTopics, peerExchangeHandler = peerExchangeHandler)
     except CatchableError:
diff --git a/apps/wakunode2/config.nim b/apps/wakunode2/config.nim
index fe513fea4..aba56ba91 100644
--- a/apps/wakunode2/config.nim
+++ b/apps/wakunode2/config.nim
@@ -42,7 +42,6 @@ type
       defaultValue: newSeq[ProtectedTopic](0)
       name: "protected-topic" .}: seq[ProtectedTopic]
 
-
     ## Log configuration
     logLevel* {.
       desc: "Sets the log level for process. Supported levels: TRACE, DEBUG, INFO, NOTICE, WARN, ERROR or FATAL",
@@ -54,7 +53,6 @@ type
       defaultValue: logging.LogFormat.TEXT,
       name: "log-format" .}: logging.LogFormat
 
-
     ## General node config
     agentString* {.
       defaultValue: "nwaku",
@@ -207,11 +205,16 @@ type
       defaultValue: false
       name: "keep-alive" }: bool
 
-    topics* {.
-      desc: "Default topics to subscribe to (space separated list)."
+    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"]
+      name: "topic" .}: seq[string]
+
     ## Store and message store config
 
     store* {.