From 9b6b33f0e5a6d7e0b51b7a85dd7e769763e28c06 Mon Sep 17 00:00:00 2001 From: stubbsta Date: Fri, 19 Dec 2025 08:59:48 +0200 Subject: [PATCH 1/4] Rework retry_wrapper from template to proc --- .../group_manager/on_chain/retry_wrapper.nim | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim b/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim index df8716279..a8f005860 100644 --- a/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim +++ b/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim @@ -1,36 +1,33 @@ -import ../../../common/error_handling import chronos import results +const + DefaultRetryDelay* = 4000.millis + DefaultRetryCount* = 15'u + type RetryStrategy* = object - shouldRetry*: bool retryDelay*: Duration retryCount*: uint proc new*(T: type RetryStrategy): RetryStrategy = - return RetryStrategy(shouldRetry: true, retryDelay: 4000.millis, retryCount: 15) + return RetryStrategy(retryDelay: DefaultRetryDelay, retryCount: DefaultRetryCount) -template retryWrapper*( - res: auto, +proc retryWrapper*[T]( retryStrategy: RetryStrategy, errStr: string, - errCallback: OnFatalErrorHandler, - body: untyped, -): auto = - if errCallback == nil: - raise newException(CatchableError, "Ensure that the errCallback is set") + body: proc(): Future[T] {.async.}, +): Future[Result[T, string]] {.async.} = var retryCount = retryStrategy.retryCount - var shouldRetry = retryStrategy.shouldRetry - var exceptionMessage = "" + var lastError = "" - while shouldRetry and retryCount > 0: + while retryCount > 0: try: - res = body - shouldRetry = false - except: + let value = await body() + return ok(value) + except CatchableError as e: retryCount -= 1 - exceptionMessage = getCurrentExceptionMsg() - await sleepAsync(retryStrategy.retryDelay) - if shouldRetry: - errCallback(errStr & ": " & exceptionMessage) - return + lastError = e.msg + if retryCount > 0: + await sleepAsync(retryStrategy.retryDelay) + + return err(errStr & ": " & lastError) From 879c79161f0a5278d2bc12f4137ac314f83b2bd6 Mon Sep 17 00:00:00 2001 From: stubbsta Date: Fri, 19 Dec 2025 09:00:29 +0200 Subject: [PATCH 2/4] Rework retry_wrapper from template to proc --- .../group_manager/on_chain/group_manager.nim | 155 +++++++++++------- waku/waku_rln_relay/rln_relay.nim | 2 +- 2 files changed, 95 insertions(+), 62 deletions(-) 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 2ce7d4423..aef7c0b59 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 @@ -148,12 +148,6 @@ template initializedGuard(g: OnchainGroupManager): untyped = if not g.initialized: raise newException(CatchableError, "OnchainGroupManager is not initialized") -template retryWrapper( - g: OnchainGroupManager, res: auto, errStr: string, body: untyped -): auto = - retryWrapper(res, RetryStrategy.new(), errStr, g.onFatalErrorAction): - body - proc updateRoots*(g: OnchainGroupManager): Future[bool] {.async.} = let rootRes = (await g.fetchMerkleRoot()).valueOr: return false @@ -172,7 +166,7 @@ proc updateRoots*(g: OnchainGroupManager): Future[bool] {.async.} = return false -proc trackRootChanges*(g: OnchainGroupManager) {.async: (raises: [CatchableError]).} = +proc trackRootChanges*(g: OnchainGroupManager): Future[Result[void, string]] {.async.} = try: initializedGuard(g) const rpcDelay = 5.seconds @@ -194,18 +188,21 @@ proc trackRootChanges*(g: OnchainGroupManager) {.async: (raises: [CatchableError let nextFreeIndex = (await g.fetchNextFreeIndex()).valueOr: error "Failed to fetch next free index", error = error - raise - newException(CatchableError, "Failed to fetch next free index: " & error) + return err("Failed to fetch next free index: " & error) let memberCount = cast[int64](nextFreeIndex) waku_rln_number_registered_memberships.set(float64(memberCount)) except CatchableError: error "Fatal error in trackRootChanges", error = getCurrentExceptionMsg() + return err("Fatal error in trackRootChanges" & getCurrentExceptionMsg()) method register*( g: OnchainGroupManager, rateCommitment: RateCommitment -): Future[void] {.async: (raises: [Exception]).} = - initializedGuard(g) +): Future[Result[void, string]] {.async.} = + try: + initializedGuard(g) + except CatchableError as e: + return err("Not initialized: " & e.msg) try: let leaf = rateCommitment.toLeaf().get() @@ -214,33 +211,41 @@ method register*( info "registering member via callback", rateCommitment = leaf, index = idx await g.registerCb.get()(@[Membership(rateCommitment: leaf, index: idx)]) g.latestIndex.inc() - except CatchableError: - raise newException(ValueError, getCurrentExceptionMsg()) + except Exception as e: + return err("Failed to call register callback: " & e.msg) method register*( g: OnchainGroupManager, identityCredential: IdentityCredential, userMessageLimit: UserMessageLimit, -): Future[void] {.async: (raises: [Exception]).} = - initializedGuard(g) +): Future[Result[void, string]] {.async.} = + try: + initializedGuard(g) + except CatchableError as e: + return err("Not initialized: " & e.msg) let ethRpc = g.ethRpc.get() let wakuRlnContract = g.wakuRlnContract.get() - var gasPrice: int - g.retryWrapper(gasPrice, "Failed to get gas price"): - let fetchedGasPrice = uint64(await ethRpc.provider.eth_gasPrice()) - ## Multiply by 2 to speed up the transaction - ## Check for overflow when casting to int - if fetchedGasPrice > uint64(high(int) div 2): - warn "Gas price overflow detected, capping at maximum int value", - fetchedGasPrice = fetchedGasPrice, maxInt = high(int) - high(int) - else: - let calculatedGasPrice = int(fetchedGasPrice) * 2 - debug "Gas price calculated", - fetchedGasPrice = fetchedGasPrice, gasPrice = calculatedGasPrice - calculatedGasPrice + let gasPrice = ( + await retryWrapper( + RetryStrategy.new(), + "Failed to get gas price", + proc(): Future[int] {.async.} = + let fetchedGasPrice = uint64(await ethRpc.provider.eth_gasPrice()) + if fetchedGasPrice > uint64(high(int) div 2): + warn "Gas price overflow detected, capping at maximum int value", + fetchedGasPrice = fetchedGasPrice, maxInt = high(int) + return high(int) + else: + let calculatedGasPrice = int(fetchedGasPrice) * 2 + debug "Gas price calculated", + fetchedGasPrice = fetchedGasPrice, gasPrice = calculatedGasPrice + return calculatedGasPrice, + ) + ).valueOr: + return err("Failed to get gas price: " & error) + let idCommitmentHex = identityCredential.idCommitment.inHex() debug "identityCredential idCommitmentHex", idCommitment = idCommitmentHex let idCommitment = identityCredential.idCommitment.toUInt256() @@ -249,16 +254,28 @@ method register*( idCommitment = idCommitment, userMessageLimit = userMessageLimit, idCommitmentsToErase = idCommitmentsToErase - var txHash: TxHash - g.retryWrapper(txHash, "Failed to register the member"): - await wakuRlnContract - .register(idCommitment, userMessageLimit.stuint(32), idCommitmentsToErase) - .send(gasPrice = gasPrice) + let txHash = ( + await retryWrapper( + RetryStrategy.new(), + "Failed to register the member", + proc(): Future[TxHash] {.async.} = + return await wakuRlnContract + .register(idCommitment, userMessageLimit.stuint(32), idCommitmentsToErase) + .send(gasPrice = gasPrice), + ) + ).valueOr: + return err("Failed to register member: " & error) # wait for the transaction to be mined - var tsReceipt: ReceiptObject - g.retryWrapper(tsReceipt, "Failed to get the transaction receipt"): - await ethRpc.getMinedTransactionReceipt(txHash) + let tsReceipt = ( + await retryWrapper( + RetryStrategy.new(), + "Failed to get the transaction receipt", + proc(): Future[ReceiptObject] {.async.} = + return await ethRpc.getMinedTransactionReceipt(txHash), + ) + ).valueOr: + return err("Failed to get transaction receipt: " & error) debug "registration transaction mined", txHash = txHash g.registrationTxHash = some(txHash) # the receipt topic holds the hash of signature of the raised events @@ -309,10 +326,13 @@ method register*( if g.registerCb.isSome(): let member = Membership(rateCommitment: rateCommitment, index: g.latestIndex) - await g.registerCb.get()(@[member]) + try: + await g.registerCb.get()(@[member]) + except Exception as e: + return err("Failed to call register callback: " & e.msg) g.latestIndex.inc() - return + return ok() method withdraw*( g: OnchainGroupManager, idCommitment: IDCommitment @@ -492,25 +512,30 @@ method onWithdraw*(g: OnchainGroupManager, cb: OnWithdrawCallback) {.gcsafe.} = proc establishConnection( g: OnchainGroupManager ): Future[GroupManagerResult[Web3]] {.async.} = - var ethRpc: Web3 + let ethRpc = ( + await retryWrapper( + RetryStrategy.new(), + "Failed to connect to the Ethereum client", + proc(): Future[Web3] {.async.} = + var innerEthRpc: Web3 + var connected = false + for clientUrl in g.ethClientUrls: + ## We give a chance to the user to provide multiple clients + ## and we try to connect to each of them + try: + innerEthRpc = await newWeb3(clientUrl) + connected = true + break + except CatchableError: + error "failed connect Eth client", error = getCurrentExceptionMsg() - g.retryWrapper(ethRpc, "Failed to connect to the Ethereum client"): - var innerEthRpc: Web3 - var connected = false - for clientUrl in g.ethClientUrls: - ## We give a chance to the user to provide multiple clients - ## and we try to connect to each of them - try: - innerEthRpc = await newWeb3(clientUrl) - connected = true - break - except CatchableError: - error "failed connect Eth client", error = getCurrentExceptionMsg() + if not connected: + raise newException(CatchableError, "all failed") - if not connected: - raise newException(CatchableError, "all failed") - - innerEthRpc + return innerEthRpc, + ) + ).valueOr: + return err("Failed to establish Ethereum connection: " & error) return ok(ethRpc) @@ -519,9 +544,15 @@ method init*(g: OnchainGroupManager): Future[GroupManagerResult[void]] {.async.} let ethRpc: Web3 = (await establishConnection(g)).valueOr: return err("failed to connect to Ethereum clients: " & $error) - var fetchedChainId: UInt256 - g.retryWrapper(fetchedChainId, "Failed to get the chain id"): - await ethRpc.provider.eth_chainId() + let fetchedChainId = ( + await retryWrapper( + RetryStrategy.new(), + "Failed to get the chain id", + proc(): Future[UInt256] {.async.} = + return await ethRpc.provider.eth_chainId(), + ) + ).valueOr: + return err("Failed to get chain id: " & error) # Set the chain id if g.chainId == 0: @@ -595,8 +626,10 @@ method init*(g: OnchainGroupManager): Future[GroupManagerResult[void]] {.async.} proc onDisconnect() {.async.} = error "Ethereum client disconnected" - var newEthRpc: Web3 = (await g.establishConnection()).valueOr: - g.onFatalErrorAction("failed to connect to Ethereum clients onDisconnect") + let newEthRpc: Web3 = (await g.establishConnection()).valueOr: + error "Fatal: failed to reconnect to Ethereum clients after disconnect", + error = error + g.onFatalErrorAction("failed to reconnect to Ethereum clients: " & error) return newEthRpc.ondisconnect = ethRpc.ondisconnect diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim index 6a8fea2b5..d918f525a 100644 --- a/waku/waku_rln_relay/rln_relay.nim +++ b/waku/waku_rln_relay/rln_relay.nim @@ -64,7 +64,7 @@ type WakuRLNRelay* = ref object of RootObj onFatalErrorAction*: OnFatalErrorHandler nonceManager*: NonceManager epochMonitorFuture*: Future[void] - rootChangesFuture*: Future[void] + rootChangesFuture*: Future[Result[void, string]] proc calcEpoch*(rlnPeer: WakuRLNRelay, t: float64): Epoch = ## gets time `t` as `flaot64` with subseconds resolution in the fractional part From a87cb50e3e3b480d61d10687e4bf6fa38055c39c Mon Sep 17 00:00:00 2001 From: stubbsta Date: Fri, 19 Dec 2025 09:01:51 +0200 Subject: [PATCH 3/4] Update error handling in rln group-manager tests --- .../test_rln_group_manager_onchain.nim | 39 ++++++++----------- .../rln_keystore_generator.nim | 5 ++- 2 files changed, 20 insertions(+), 24 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 aac900911..496a373b9 100644 --- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -86,10 +86,8 @@ suite "Onchain group manager": let merkleRootBefore = waitFor manager.fetchMerkleRoot() - try: - waitFor manager.register(credentials, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, "exception raised: " & getCurrentExceptionMsg() + (waitFor manager.register(credentials, UserMessageLimit(20))).isOkOr: + raiseAssert "Failed to register: " & error discard waitFor withTimeout(trackRootChanges(manager), 15.seconds) @@ -110,13 +108,11 @@ suite "Onchain group manager": let merkleRootBefore = waitFor manager.fetchMerkleRoot() - try: - for i in 0 ..< credentials.len(): - info "Registering credential", index = i, credential = credentials[i] - waitFor manager.register(credentials[i], UserMessageLimit(20)) - discard waitFor manager.updateRoots() - except Exception, CatchableError: - assert false, "exception raised: " & getCurrentExceptionMsg() + for i in 0 ..< credentials.len(): + info "Registering credential", index = i, credential = credentials[i] + (waitFor manager.register(credentials[i], UserMessageLimit(20))).isOkOr: + raiseAssert "Failed to register credential " & $i & ": " & error + discard waitFor manager.updateRoots() let merkleRootAfter = waitFor manager.fetchMerkleRoot() @@ -127,16 +123,15 @@ suite "Onchain group manager": test "register: should guard against uninitialized state": let dummyCommitment = default(IDCommitment) - try: - waitFor manager.register( - RateCommitment( - idCommitment: dummyCommitment, userMessageLimit: UserMessageLimit(20) - ) + let res = waitFor manager.register( + RateCommitment( + idCommitment: dummyCommitment, userMessageLimit: UserMessageLimit(20) ) - except CatchableError: - assert true - except Exception: - assert false, "exception raised: " & getCurrentExceptionMsg() + ) + + check: + res.isErr() + res.error == "Not initialized: OnchainGroupManager is not initialized" test "register: should register successfully": # TODO :- similar to ```trackRootChanges: should fetch history correctly``` @@ -146,9 +141,7 @@ suite "Onchain group manager": let idCredentials = generateCredentials() let merkleRootBefore = waitFor manager.fetchMerkleRoot() - try: - waitFor manager.register(idCredentials, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager.register(idCredentials, UserMessageLimit(20))).isOkOr: assert false, "exception raised when calling register: " & getCurrentExceptionMsg() diff --git a/tools/rln_keystore_generator/rln_keystore_generator.nim b/tools/rln_keystore_generator/rln_keystore_generator.nim index 85df37982..3329a9a70 100644 --- a/tools/rln_keystore_generator/rln_keystore_generator.nim +++ b/tools/rln_keystore_generator/rln_keystore_generator.nim @@ -73,7 +73,10 @@ proc doRlnKeystoreGenerator*(conf: RlnKeystoreGeneratorConf) = # 4. register on-chain try: - waitFor groupManager.register(credential, conf.userMessageLimit) + let registerResult = waitFor groupManager.register(credential, conf.userMessageLimit) + if registerResult.isErr(): + error "Failed to register on-chain", error = registerResult.error + quit(QuitFailure) except Exception, CatchableError: error "failure while registering credentials on-chain", error = getCurrentExceptionMsg() From dce45ba9e876d3ade9f8b6da06d9fa26634c875b Mon Sep 17 00:00:00 2001 From: stubbsta Date: Fri, 19 Dec 2025 14:50:05 +0200 Subject: [PATCH 4/4] modify rln tests that use group manager --- .../test_rln_group_manager_onchain.nim | 65 +++++++++---------- tests/waku_rln_relay/test_waku_rln_relay.nim | 26 +++----- .../test_wakunode_rln_relay.nim | 33 ++++------ .../group_manager/on_chain/group_manager.nim | 30 +++++---- 4 files changed, 68 insertions(+), 86 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 496a373b9..22802465b 100644 --- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim +++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim @@ -87,7 +87,8 @@ suite "Onchain group manager": let merkleRootBefore = waitFor manager.fetchMerkleRoot() (waitFor manager.register(credentials, UserMessageLimit(20))).isOkOr: - raiseAssert "Failed to register: " & error + assert false, + "error returned when calling register: " & error discard waitFor withTimeout(trackRootChanges(manager), 15.seconds) @@ -111,7 +112,7 @@ suite "Onchain group manager": for i in 0 ..< credentials.len(): info "Registering credential", index = i, credential = credentials[i] (waitFor manager.register(credentials[i], UserMessageLimit(20))).isOkOr: - raiseAssert "Failed to register credential " & $i & ": " & error + assert false, "Failed to register credential " & $i & ": " & error discard waitFor manager.updateRoots() let merkleRootAfter = waitFor manager.fetchMerkleRoot() @@ -143,7 +144,7 @@ suite "Onchain group manager": (waitFor manager.register(idCredentials, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error let merkleRootAfter = waitFor manager.fetchMerkleRoot() @@ -170,26 +171,24 @@ suite "Onchain group manager": manager.onRegister(callback) - try: - waitFor manager.register( - RateCommitment( - idCommitment: idCommitment, userMessageLimit: UserMessageLimit(20) - ) + (waitFor manager.register( + RateCommitment( + idCommitment: idCommitment, userMessageLimit: UserMessageLimit(20) ) - except Exception, CatchableError: - assert false, "exception raised: " & getCurrentExceptionMsg() + )).isOkOr: + assert false, + "error returned when calling register: " & error waitFor fut test "withdraw: should guard against uninitialized state": let idSecretHash = generateCredentials().idSecretHash - try: - waitFor manager.withdraw(idSecretHash) - except CatchableError: - assert true - except Exception: - assert false, "exception raised: " & getCurrentExceptionMsg() + let res = waitFor manager.withdraw(idSecretHash) + + check: + res.isErr() + res.error == "Not initialized: OnchainGroupManager is not initialized" test "validateRoot: should validate good root": let idCredentials = generateCredentials() @@ -210,10 +209,8 @@ suite "Onchain group manager": (waitFor manager.init()).isOkOr: raiseAssert $error - try: - waitFor manager.register(idCredentials, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, "exception raised: " & getCurrentExceptionMsg() + (waitFor manager.register(idCredentials, UserMessageLimit(20))).isOkOr: + assert false, "error returned : " & getCurrentExceptionMsg() waitFor fut @@ -292,10 +289,10 @@ suite "Onchain group manager": manager.onRegister(callback) - try: - waitFor manager.register(credentials, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, "exception raised: " & getCurrentExceptionMsg() + + (waitFor manager.register(credentials, UserMessageLimit(20))).isOkOr: + assert false, + "error returned when calling register: " & error waitFor fut let rootUpdated = waitFor manager.updateRoots() @@ -330,11 +327,9 @@ suite "Onchain group manager": let idCredential = generateCredentials() - try: - waitFor manager.register(idCredential, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, - "exception raised when calling startGroupSync: " & getCurrentExceptionMsg() + (waitFor manager.register(idCredential, UserMessageLimit(20))).isOkOr: + assert false, + "error returned when calling register: " & error let messageBytes = "Hello".toBytes() @@ -388,14 +383,12 @@ suite "Onchain group manager": return callback - try: - manager.onRegister(generateCallback(futures, credentials)) + manager.onRegister(generateCallback(futures, credentials)) - for i in 0 ..< credentials.len(): - waitFor manager.register(credentials[i], UserMessageLimit(20)) - discard waitFor manager.updateRoots() - except Exception, CatchableError: - assert false, "exception raised: " & getCurrentExceptionMsg() + for i in 0 ..< credentials.len(): + (waitFor manager.register(credentials[i], UserMessageLimit(20))).isOkOr: + assert false, "Failed to register credential " & $i & ": " & error + discard waitFor manager.updateRoots() waitFor allFutures(futures) diff --git a/tests/waku_rln_relay/test_waku_rln_relay.nim b/tests/waku_rln_relay/test_waku_rln_relay.nim index 3430657ad..4adfc13f5 100644 --- a/tests/waku_rln_relay/test_waku_rln_relay.nim +++ b/tests/waku_rln_relay/test_waku_rln_relay.nim @@ -239,11 +239,8 @@ suite "Waku rln relay": let manager = cast[OnchainGroupManager](wakuRlnRelay.groupManager) let idCredentials = generateCredentials() - try: - waitFor manager.register(idCredentials, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + (waitFor manager.register(idCredentials, UserMessageLimit(20))).isOkOr: + assert false, "error returned when calling register: " & error let epoch1 = wakuRlnRelay.getCurrentEpoch() @@ -296,11 +293,8 @@ suite "Waku rln relay": let manager = cast[OnchainGroupManager](wakuRlnRelay.groupManager) let idCredentials = generateCredentials() - try: - waitFor manager.register(idCredentials, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + (waitFor manager.register(idCredentials, UserMessageLimit(20))).isOkOr: + assert false, "error returned when calling register: " & error # usually it's 20 seconds but we set it to 1 for testing purposes which make the test faster wakuRlnRelay.rlnMaxTimestampGap = 1 @@ -346,11 +340,9 @@ suite "Waku rln relay": let manager1 = cast[OnchainGroupManager](wakuRlnRelay1.groupManager) let idCredentials1 = generateCredentials() - try: - waitFor manager1.register(idCredentials1, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager1.register(idCredentials1, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error let index2 = MembershipIndex(6) let rlnConf2 = getWakuRlnConfig(manager = manager, index = index2) @@ -360,11 +352,9 @@ suite "Waku rln relay": let manager2 = cast[OnchainGroupManager](wakuRlnRelay2.groupManager) let idCredentials2 = generateCredentials() - try: - waitFor manager2.register(idCredentials2, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager2.register(idCredentials2, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error # get the current epoch time let epoch = wakuRlnRelay1.getCurrentEpoch() diff --git a/tests/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/waku_rln_relay/test_wakunode_rln_relay.nim index 1850b5277..2e535c0e9 100644 --- a/tests/waku_rln_relay/test_wakunode_rln_relay.nim +++ b/tests/waku_rln_relay/test_wakunode_rln_relay.nim @@ -65,11 +65,9 @@ procSuite "WakuNode - RLN relay": let manager1 = cast[OnchainGroupManager](node1.wakuRlnRelay.groupManager) let idCredentials1 = generateCredentials() - try: - waitFor manager1.register(idCredentials1, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager1.register(idCredentials1, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error let rootUpdated1 = waitFor manager1.updateRoots() info "Updated root for node1", rootUpdated1 @@ -182,11 +180,9 @@ procSuite "WakuNode - RLN relay": let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials() - try: - waitFor manager.register(idCredentials, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager.register(idCredentials, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error let rootUpdated = waitFor manager.updateRoots() info "Updated root for node", node = index + 1, rootUpdated = rootUpdated @@ -301,11 +297,9 @@ procSuite "WakuNode - RLN relay": let manager1 = cast[OnchainGroupManager](node1.wakuRlnRelay.groupManager) let idCredentials1 = generateCredentials() - try: - waitFor manager1.register(idCredentials1, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager1.register(idCredentials1, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error let rootUpdated1 = waitFor manager1.updateRoots() info "Updated root for node1", rootUpdated1 @@ -418,11 +412,9 @@ procSuite "WakuNode - RLN relay": let manager1 = cast[OnchainGroupManager](node1.wakuRlnRelay.groupManager) let idCredentials1 = generateCredentials() - try: - waitFor manager1.register(idCredentials1, UserMessageLimit(20)) - except Exception, CatchableError: + (waitFor manager1.register(idCredentials1, UserMessageLimit(20))).isOkOr: assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + "error returned when calling register: " & error let rootUpdated1 = waitFor manager1.updateRoots() info "Updated root for node1", rootUpdated1 @@ -585,11 +577,10 @@ procSuite "WakuNode - RLN relay": let manager1 = cast[OnchainGroupManager](node1.wakuRlnRelay.groupManager) let idCredentials1 = generateCredentials() - try: - waitFor manager1.register(idCredentials1, UserMessageLimit(20)) - except Exception, CatchableError: - assert false, - "exception raised when calling register: " & getCurrentExceptionMsg() + (waitFor manager1.register(idCredentials1, UserMessageLimit(20))).isOkOr: + assert false, + "error returned when calling register: " & error + let rootUpdated1 = waitFor manager1.updateRoots() info "Updated root for node1", rootUpdated1 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 aef7c0b59..1d1474f3c 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 @@ -214,6 +214,8 @@ method register*( except Exception as e: return err("Failed to call register callback: " & e.msg) + return ok() + method register*( g: OnchainGroupManager, identityCredential: IdentityCredential, @@ -282,11 +284,9 @@ method register*( debug "ts receipt", receipt = tsReceipt[] if tsReceipt.status.isNone(): - raise newException(ValueError, "Transaction failed: status is None") + return err("Transaction failed: status is None") if tsReceipt.status.get() != 1.Quantity: - raise newException( - ValueError, "Transaction failed with status: " & $tsReceipt.status.get() - ) + return err("Transaction failed with status: " & $tsReceipt.status.get()) ## Search through all transaction logs to find the MembershipRegistered event let expectedEventSignature = cast[FixedBytes[32]](keccak.keccak256.digest( @@ -300,9 +300,7 @@ method register*( break if membershipRegisteredLog.isNone(): - raise newException( - ValueError, "register: MembershipRegistered event not found in transaction logs" - ) + return err("register: MembershipRegistered event not found in transaction logs") let registrationLog = membershipRegisteredLog.get() @@ -336,13 +334,23 @@ method register*( method withdraw*( g: OnchainGroupManager, idCommitment: IDCommitment -): Future[void] {.async: (raises: [Exception]).} = - initializedGuard(g) # TODO: after slashing is enabled on the contract +): Future[Result[void, string]] {.async.} = + try: + initializedGuard(g) + except CatchableError as e: + return err("Not initialized: " & e.msg) + + return ok() method withdrawBatch*( g: OnchainGroupManager, idCommitments: seq[IDCommitment] -): Future[void] {.async: (raises: [Exception]).} = - initializedGuard(g) +): Future[Result[void, string]] {.async.} = + try: + initializedGuard(g) + except CatchableError as e: + return err("Not initialized: " & e.msg) + + return ok() proc getRootFromProofAndIndex( g: OnchainGroupManager, elements: seq[byte], bits: seq[byte]