From 8773eb609dbab1afb0de42ab1e2a299f094d3384 Mon Sep 17 00:00:00 2001 From: jangko Date: Thu, 24 Aug 2023 11:34:12 +0700 Subject: [PATCH] Fix engine api client ambiguity in engine api sim --- hive_integration/nodocker/engine/clmock.nim | 4 ++-- .../nodocker/engine/engine_client.nim | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hive_integration/nodocker/engine/clmock.nim b/hive_integration/nodocker/engine/clmock.nim index 1a6eb64aa..2d2314822 100644 --- a/hive_integration/nodocker/engine/clmock.nim +++ b/hive_integration/nodocker/engine/clmock.nim @@ -233,8 +233,8 @@ proc fcu(cl: CLMocker, version: Version, Result[ForkchoiceUpdatedResponse, string] = case version of Version.V1: cl.client.forkchoiceUpdatedV1(update, attr.V1) - of Version.V2: cl.client.forkchoiceUpdatedV2(update, attr.V2) - of Version.V3: cl.client.forkchoiceUpdatedV3(update, attr.V3) + of Version.V2: cl.client.forkchoiceUpdatedV2(update, attr) + of Version.V3: cl.client.forkchoiceUpdatedV3(update, attr) proc getNextPayloadID*(cl: CLMocker): bool = # Generate a random value for the PrevRandao field diff --git a/hive_integration/nodocker/engine/engine_client.nim b/hive_integration/nodocker/engine/engine_client.nim index a623096d8..91f69bc7a 100644 --- a/hive_integration/nodocker/engine/engine_client.nim +++ b/hive_integration/nodocker/engine/engine_client.nim @@ -41,19 +41,19 @@ proc forkchoiceUpdatedV1*(client: RpcClient, wrapTrySimpleRes: client.engine_forkchoiceUpdatedV1(update, payloadAttributes) -proc forkchoiceUpdatedV2*(client: RpcClient, - update: ForkchoiceStateV1, - payloadAttributes = none(PayloadAttributesV2)): - Result[ForkchoiceUpdatedResponse, string] = - wrapTrySimpleRes: - client.engine_forkchoiceUpdatedV2(update, payloadAttributes) +#proc forkchoiceUpdatedV2*(client: RpcClient, +# update: ForkchoiceStateV1, +# payloadAttributes = none(PayloadAttributesV2)): +# Result[ForkchoiceUpdatedResponse, string] = +# wrapTrySimpleRes: +# client.engine_forkchoiceUpdatedV2(update, payloadAttributes) -proc forkchoiceUpdatedV3*(client: RpcClient, - update: ForkchoiceStateV1, - payloadAttributes = none(PayloadAttributesV3)): - Result[ForkchoiceUpdatedResponse, string] = - wrapTrySimpleRes: - client.engine_forkchoiceUpdatedV3(update, payloadAttributes) +#proc forkchoiceUpdatedV3*(client: RpcClient, +# update: ForkchoiceStateV1, +# payloadAttributes = none(PayloadAttributesV3)): +# Result[ForkchoiceUpdatedResponse, string] = +# wrapTrySimpleRes: +# client.engine_forkchoiceUpdatedV3(update, payloadAttributes) proc forkchoiceUpdatedV2*(client: RpcClient, update: ForkchoiceStateV1,