Merge branch 'master' into rln-relay/consolidate-rln-credential-input…

…-paths

examples/v2/chat2.nim

@@ -30,7 +30,7 @@ import   ../../waku/v2/protocol/waku_message,
          ../../waku/common/utils/nat,
          ./config_chat2
 
-when defined(rln):
+when defined(rln) or defined(rlnzerokit):
   import
     libp2p/protocols/pubsub/rpc/messages,
     libp2p/protocols/pubsub/pubsub,
@@ -219,7 +219,7 @@ proc publish(c: Chat, line: string) =
     if encodedPayload.isOk():
       var message = WakuMessage(payload: encodedPayload.get(),
         contentTopic: c.contentTopic, version: version, timestamp: getNanosecondTime(time))
-      when defined(rln):
+      when defined(rln) or defined(rlnzerokit):
         if  not isNil(c.node.wakuRlnRelay):
           # for future version when we support more than one rln protected content topic, 
           # we should check the message content topic as well
@@ -241,7 +241,7 @@ proc publish(c: Chat, line: string) =
     # No payload encoding/encryption from Waku
     var message = WakuMessage(payload: chat2pb.buffer,
       contentTopic: c.contentTopic, version: 0, timestamp: getNanosecondTime(time))
-    when defined(rln):
+    when defined(rln) or defined(rlnzerokit):
       if  not isNil(c.node.wakuRlnRelay):
         # for future version when we support more than one rln protected content topic, 
         # we should check the message content topic as well
@@ -498,7 +498,7 @@ proc processInput(rfd: AsyncFD, rng: ref BrHmacDrbgContext) {.async.} =
     let topic = cast[Topic](DefaultTopic)
     node.subscribe(topic, handler)
 
-    when defined(rln): 
+    when defined(rln) or defined(rlnzerokit): 
       if conf.rlnRelay:
         info "WakuRLNRelay is enabled"
 

tests/v2/test_waku_rln_relay.nim

@@ -755,8 +755,6 @@ suite "Waku rln relay":
       proofAdded3 = wakuRlnRelay.appendRLNProof(wm3, time+EPOCH_UNIT_SECONDS)
       wm4 = WakuMessage(payload: "Invalid message".toBytes())
 
-    echo wm1.proof
-
     # checks proofs are added
     check:
       proofAdded1