From e04e95167dbfb0eec14ce6edeac414dd217ccf89 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Mon, 19 Feb 2024 10:52:35 +0100 Subject: [PATCH] avoid `read`/`readError` in favor of `value`/`error` (#5904) In VC logic, bump 3 remaining uses of `readError`/`read` to use `error`/`value` instead. The surrounding logic guarantees success. --- beacon_chain/validator_client/api.nim | 4 +++- beacon_chain/validator_client/common.nim | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/beacon_chain/validator_client/api.nim b/beacon_chain/validator_client/api.nim index 7a15ef33e..e455f9855 100644 --- a/beacon_chain/validator_client/api.nim +++ b/beacon_chain/validator_client/api.nim @@ -5,6 +5,8 @@ # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). # at your option. This file may not be copied, modified, or distributed except according to those terms. +{.push raises: [].} + import std/strutils import chronicles, stew/base10 import ".."/spec/eth2_apis/eth2_rest_serialization, @@ -123,7 +125,7 @@ proc apiResponseOr[T](future: FutureBase, timerFut: Future[void], if future.failed(): ApiResponse[T].err($future.error.msg) else: - ApiResponse[T].ok(Future[T](future).read()) + ApiResponse[T].ok(Future[T](future).value()) else: if timerFut.finished(): ApiResponse[T].err(message) diff --git a/beacon_chain/validator_client/common.nim b/beacon_chain/validator_client/common.nim index 5a8126cad..aa610ae58 100644 --- a/beacon_chain/validator_client/common.nim +++ b/beacon_chain/validator_client/common.nim @@ -5,6 +5,8 @@ # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). # at your option. This file may not be copied, modified, or distributed except according to those terms. +{.push raises: [].} + import std/[tables, os, sets, sequtils, strutils, uri, algorithm], results, @@ -1045,12 +1047,12 @@ proc getValidatorRegistration( if sigfut.finished(): # This is short-path if we able to create signature locally. if not(sigfut.completed()): - let exc = sigfut.readError() + let exc = sigfut.error() debug "Got unexpected exception while signing validator registration", validator = shortLog(validator), error_name = $exc.name, error_msg = $exc.msg return err(RegistrationKind.ErrorSignature) - let sigres = sigfut.read() + let sigres = sigfut.value() if sigres.isErr(): debug "Failed to get signature for validator registration", validator = shortLog(validator), error = sigres.error()