chore(rln): run rln in all relay pubsubtopics + remove cli flags (#1917)

waku-org · Aug 21, 2023 · af95b57 · af95b57
1 parent b3bb7a1
commit af95b57
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 113 deletions.
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
@@ -456,7 +456,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
     let peerInfo = parsePeerInfo(conf.lightpushnode)
     if peerInfo.isOk():
       await mountLightPush(node)
-      node.mountLightPushClient() 
+      node.mountLightPushClient()
       node.peerManager.addServicePeer(peerInfo.value, WakuLightpushCodec)
     else:
       error "LightPush not mounted. Couldn't parse conf.lightpushnode",
@@ -510,8 +510,6 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
 
         let rlnConf = WakuRlnConfig(
           rlnRelayDynamic: conf.rlnRelayDynamic,
-          rlnRelayPubsubTopic: conf.rlnRelayPubsubTopic,
-          rlnRelayContentTopic: conf.rlnRelayContentTopic,
           rlnRelayCredIndex: conf.rlnRelayCredIndex,
           rlnRelayMembershipGroupIndex: conf.rlnRelayMembershipGroupIndex,
           rlnRelayEthContractAddress: conf.rlnRelayEthContractAddress,

diff --git a/apps/chat2/config_chat2.nim b/apps/chat2/config_chat2.nim
@@ -242,16 +242,6 @@ type
       defaultValue: 0
       name: "rln-relay-membership-group-index" }: uint
 
-    rlnRelayContentTopic* {.
-      desc: "the content topic for which rln-relay gets enabled",
-      defaultValue: "/toy-chat/3/mingde/proto"
-      name: "rln-relay-content-topic" }: ContentTopic
-
-    rlnRelayPubsubTopic* {.
-      desc: "the pubsub topic for which rln-relay gets enabled",
-      defaultValue: "/waku/2/default-waku/proto"
-      name: "rln-relay-pubsub-topic" }: string
-
     rlnRelayDynamic* {.
       desc: "Enable waku-rln-relay with on-chain dynamic group management: true|false",
       defaultValue: false

diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim
@@ -397,8 +397,6 @@ proc setupProtocols(node: WakuNode,
 
       let rlnConf = WakuRlnConfig(
         rlnRelayDynamic: conf.rlnRelayDynamic,
-        rlnRelayPubsubTopic: conf.rlnRelayPubsubTopic,
-        rlnRelayContentTopic: conf.rlnRelayContentTopic,
         rlnRelayCredIndex: conf.rlnRelayCredIndex,
         rlnRelayMembershipGroupIndex: conf.rlnRelayMembershipGroupIndex,
         rlnRelayEthContractAddress: conf.rlnRelayEthContractAddress,

diff --git a/apps/wakunode2/external_config.nim b/apps/wakunode2/external_config.nim
@@ -155,16 +155,6 @@ type
       defaultValue: 0
       name: "rln-relay-membership-group-index" }: uint
 
-    rlnRelayPubsubTopic* {.
-      desc: "the pubsub topic for which rln-relay gets enabled",
-      defaultValue: "/waku/2/default-waku/proto"
-      name: "rln-relay-pubsub-topic" }: string
-
-    rlnRelayContentTopic* {.
-      desc: "the content topic for which rln-relay gets enabled",
-      defaultValue: "/toy-chat/3/mingde/proto"
-      name: "rln-relay-content-topic" }: string
-
     rlnRelayDynamic* {.
       desc: "Enable  waku-rln-relay with on-chain dynamic group management: true|false",
       defaultValue: false

diff --git a/tests/waku_rln_relay/test_waku_rln_relay.nim b/tests/waku_rln_relay/test_waku_rln_relay.nim
@@ -18,9 +18,6 @@ import
   ../../../waku/waku_keystore,
   ../testlib/common
 
-const RlnRelayPubsubTopic = "waku/2/rlnrelay/proto"
-const RlnRelayContentTopic = "waku/2/rlnrelay/proto"
-
 proc createRLNInstanceWrapper(): RLNResult =
   return createRlnInstance(tree_path = genTempPath("rln_tree", "waku_rln_relay"))
 
@@ -256,7 +253,7 @@ suite "Waku rln relay":
     require:
       rlnInstance.isOk()
     let rln = rlnInstance.get()
-    
+
     require:
       rln.setMetadata(RlnMetadata(lastProcessedBlock: 128)).isOk()
 
@@ -269,7 +266,7 @@ suite "Waku rln relay":
 
     check:
       metadata.lastProcessedBlock == 128
- 
+
 
   test "Merkle tree consistency check between deletion and insertion":
     # create an RLN instance
@@ -660,8 +657,6 @@ suite "Waku rln relay":
     let index = MembershipIndex(5)
 
     let rlnConf = WakuRlnConfig(rlnRelayDynamic: false,
-                                rlnRelayPubsubTopic: RlnRelayPubsubTopic,
-                                rlnRelayContentTopic: RlnRelayContentTopic,
                                 rlnRelayCredIndex: index.uint,
                                 rlnRelayTreePath: genTempPath("rln_tree", "waku_rln_relay_2"))
     let wakuRlnRelayRes = await WakuRlnRelay.new(rlnConf)
@@ -709,13 +704,11 @@ suite "Waku rln relay":
       msgValidate2 == MessageValidationResult.Spam
       msgValidate3 == MessageValidationResult.Valid
       msgValidate4 == MessageValidationResult.Invalid
-  
+
   asyncTest "should validate invalid proofs if bandwidth is available":
     let index = MembershipIndex(5)
 
     let rlnConf = WakuRlnConfig(rlnRelayDynamic: false,
-                                rlnRelayPubsubTopic: RlnRelayPubsubTopic,
-                                rlnRelayContentTopic: RlnRelayContentTopic,
                                 rlnRelayCredIndex: index.uint,
                                 rlnRelayBandwidthThreshold: 4,
                                 rlnRelayTreePath: genTempPath("rln_tree", "waku_rln_relay_3"))
@@ -736,7 +729,7 @@ suite "Waku rln relay":
       # this message will be over the bandwidth threshold, hence has to be verified, will be false (since no proof)
       wm3 = WakuMessage(payload: "Invalid message".toBytes())
       wm4 = WakuMessage(payload: "Spam message".toBytes())
-    
+
     let
       proofAdded1 = wakuRlnRelay.appendRLNProof(wm1, time)
       proofAdded2 = wakuRlnRelay.appendRLNProof(wm2, time+EpochUnitSeconds)
@@ -765,7 +758,7 @@ suite "Waku rln relay":
       msgValidate2 == MessageValidationResult.Valid
       msgValidate3 == MessageValidationResult.Invalid
       msgValidate4 == MessageValidationResult.Spam
-  
+
 
   test "toIDCommitment and toUInt256":
     # create an instance of rln