From 2cff70d1585ce887365a50920cb0c678d58037bc Mon Sep 17 00:00:00 2001
From: Tanya S <120410716+stubbsta@users.noreply.github.com>
Date: Fri, 18 Jul 2025 15:34:14 +0200
Subject: [PATCH] fix: tests using fetchMerkleRoot (#3513)

* Add waitFor for fetchMerkleRoot function in test_rln_group_manager_onchain
---
 .../test_rln_group_manager_onchain.nim        | 20 ++++++++-----------
 waku/factory/external_config.nim              |  3 ++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim
index 3de48a738..45f44b242 100644
--- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim
+++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim
@@ -135,7 +135,7 @@ suite "Onchain group manager":
     (waitFor manager.init()).isOkOr:
       raiseAssert $error
 
-    let merkleRootBefore = manager.fetchMerkleRoot()
+    let merkleRootBefore = waitFor manager.fetchMerkleRoot()
 
     try:
       waitFor manager.register(credentials, UserMessageLimit(20))
@@ -144,7 +144,7 @@ suite "Onchain group manager":
 
     discard waitFor withTimeout(trackRootChanges(manager), 15.seconds)
 
-    let merkleRootAfter = manager.fetchMerkleRoot()
+    let merkleRootAfter = waitFor manager.fetchMerkleRoot()
 
     let metadataSetRes = manager.setMetadata()
     assert metadataSetRes.isOk(), metadataSetRes.error
@@ -170,7 +170,7 @@ suite "Onchain group manager":
     (waitFor manager.init()).isOkOr:
       raiseAssert $error
 
-    let merkleRootBefore = manager.fetchMerkleRoot()
+    let merkleRootBefore = waitFor manager.fetchMerkleRoot()
 
     try:
       for i in 0 ..< credentials.len():
@@ -180,7 +180,7 @@ suite "Onchain group manager":
     except Exception, CatchableError:
       assert false, "exception raised: " & getCurrentExceptionMsg()
 
-    let merkleRootAfter = manager.fetchMerkleRoot()
+    let merkleRootAfter = waitFor manager.fetchMerkleRoot()
 
     check:
       merkleRootBefore != merkleRootAfter
@@ -205,20 +205,16 @@ suite "Onchain group manager":
     (waitFor manager.init()).isOkOr:
       raiseAssert $error
 
-    let idCommitment = generateCredentials(manager.rlnInstance).idCommitment
-    let merkleRootBefore = manager.fetchMerkleRoot()
+    let idCredentials = generateCredentials(manager.rlnInstance)
+    let merkleRootBefore = waitFor manager.fetchMerkleRoot()
 
     try:
-      waitFor manager.register(
-        RateCommitment(
-          idCommitment: idCommitment, userMessageLimit: UserMessageLimit(20)
-        )
-      )
+      waitFor manager.register(idCredentials, UserMessageLimit(20))
     except Exception, CatchableError:
       assert false,
         "exception raised when calling register: " & getCurrentExceptionMsg()
 
-    let merkleRootAfter = manager.fetchMerkleRoot()
+    let merkleRootAfter = waitFor manager.fetchMerkleRoot()
 
     check:
       merkleRootAfter != merkleRootBefore
diff --git a/waku/factory/external_config.nim b/waku/factory/external_config.nim
index a89b010a1..7cf8f8443 100644
--- a/waku/factory/external_config.nim
+++ b/waku/factory/external_config.nim
@@ -315,7 +315,8 @@ hence would have reachability issues.""",
     .}: seq[string]
 
     keepAlive* {.
-      desc: "Deprecated since >=v0.37. This param is ignored and keep alive is always active",
+      desc:
+        "Deprecated since >=v0.37. This param is ignored and keep alive is always active",
       defaultValue: true,
       name: "keep-alive"
     .}: bool