diff --git a/waku/waku_rln_relay/group_manager/group_manager_base.nim b/waku/waku_rln_relay/group_manager/group_manager_base.nim index de2962e42..9c088d4c5 100644 --- a/waku/waku_rln_relay/group_manager/group_manager_base.nim +++ b/waku/waku_rln_relay/group_manager/group_manager_base.nim @@ -144,6 +144,4 @@ method generateProof*( return err("generateProof is not implemented") method isReady*(g: GroupManager): Future[bool] {.base, async.} = - raise newException( - CatchableError, "isReady proc for " & $g.type & " is not implemented yet" - ) + return true diff --git a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim index 8e26e48ed..467605a54 100644 --- a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim +++ b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim @@ -628,14 +628,15 @@ method stop*(g: OnchainGroupManager): Future[void] {.async, gcsafe.} = g.initialized = false -method isReady*(g: OnchainGroupManager): Future[Result[bool, string]] {.async.} = +method isReady*(g: OnchainGroupManager): Future[bool] {.async.} = checkInitialized(g).isOkOr: - return err(error) + return false if g.ethRpc.isNone(): - return err("Ethereum RPC client is not configured") + error "Ethereum RPC client is not configured" + return false if g.wakuRlnContract.isNone(): - return err("Waku RLN contract is not configured") - - return ok(true) + error "Waku RLN contract is not configured" + return false + return true diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim index d918f525a..c212a871f 100644 --- a/waku/waku_rln_relay/rln_relay.nim +++ b/waku/waku_rln_relay/rln_relay.nim @@ -440,7 +440,7 @@ proc mount( wakuRlnRelay.epochMonitorFuture = monitorEpochs(wakuRlnRelay) return ok(wakuRlnRelay) -proc isReady*(rlnPeer: WakuRLNRelay): Future[bool] {.async: (raises: [Exception]).} = +proc isReady*(rlnPeer: WakuRLNRelay): Future[bool] {.async.} = ## returns true if the rln-relay protocol is ready to relay messages ## returns false otherwise