From dd3b44ff974874d32a6d86486bc8fdc5dfc86012 Mon Sep 17 00:00:00 2001
From: Lorenzo Delgado <lorenzo@status.im>
Date: Wed, 7 Sep 2022 03:51:10 +0200
Subject: [PATCH] refactor(wakunode): remove waku rln relay export from
 wakunode

---
 examples/v2/config_chat2.nim                             | 6 +++---
 waku/v2/node/config.nim                                  | 5 ++---
 waku/v2/node/wakunode2.nim                               | 3 +--
 waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/examples/v2/config_chat2.nim b/examples/v2/config_chat2.nim
index 97532e79c..f8bdf8aa2 100644
--- a/examples/v2/config_chat2.nim
+++ b/examples/v2/config_chat2.nim
@@ -6,8 +6,8 @@ import
   libp2p/crypto/secp,
   nimcrypto/utils,
   eth/keys,
-  ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_types,
   ../../waku/v2/protocol/waku_message
+
 type
   Fleet* =  enum
     none
@@ -241,8 +241,8 @@ type
    
     rlnRelayMemIndex* {.
       desc: "(experimental) the index of node in the rln-relay group: a value between 0-99 inclusive",
-      defaultValue: MembershipIndex(0)
-      name: "rln-relay-membership-index" }: MembershipIndex
+      defaultValue: 0
+      name: "rln-relay-membership-index" }: uint
 
     rlnRelayContentTopic* {.
       desc: "the pubsub topic for which rln-relay gets enabled",
diff --git a/waku/v2/node/config.nim b/waku/v2/node/config.nim
index 9015c2351..0c849ad99 100644
--- a/waku/v2/node/config.nim
+++ b/waku/v2/node/config.nim
@@ -8,7 +8,6 @@ import
   libp2p/crypto/secp,
   nimcrypto/utils,
   eth/keys,
-  ../protocol/waku_rln_relay/waku_rln_relay_types,
   ../protocol/waku_message
 
 export
@@ -121,8 +120,8 @@ type
 
     rlnRelayMemIndex* {.
       desc: "(experimental) the index of node in the rln-relay group: a value between 0-99 inclusive",
-      defaultValue: MembershipIndex(0)
-      name: "rln-relay-membership-index" }: MembershipIndex
+      defaultValue: 0
+      name: "rln-relay-membership-index" }: uint
 
     rlnRelayPubsubTopic* {.
       desc: "the pubsub topic for which rln-relay gets enabled",
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 3ba1e3abc..ca0037413 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -20,7 +20,7 @@ import
   ../protocol/waku_swap/waku_swap,
   ../protocol/waku_filter,
   ../protocol/waku_lightpush,
-  ../protocol/waku_rln_relay/[waku_rln_relay_types], 
+  ../protocol/waku_rln_relay/waku_rln_relay_types, 
   ../utils/[peers, requests, wakuenr],
   ./peer_manager/peer_manager,
   ./storage/message/waku_store_queue,
@@ -31,7 +31,6 @@ import
   ./wakunode2_types
 
 export
-  waku_rln_relay_types,
   wakunode2_types
 
 when defined(rln):
diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim
index 5ce8d0540..29b71ae3b 100644
--- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim
+++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim
@@ -1065,7 +1065,7 @@ proc mountRlnRelay*(node: WakuNode, conf: WakuNodeConf|Chat2Conf, spamHandler: O
   if not conf.rlnRelayDynamic:
     info " setting up waku-rln-relay in off-chain mode... "
     # set up rln relay inputs
-    let (groupOpt, memKeyPairOpt, memIndexOpt) = rlnRelayStaticSetUp(conf.rlnRelayMemIndex)
+    let (groupOpt, memKeyPairOpt, memIndexOpt) = rlnRelayStaticSetUp(MembershipIndex(conf.rlnRelayMemIndex))
     if memIndexOpt.isNone:
       error "failed to mount WakuRLNRelay"
     else: