From 0012deda7965d8a3f464c29763ef26623b6776f8 Mon Sep 17 00:00:00 2001
From: Dustin Brody <tersec@users.noreply.github.com>
Date: Fri, 11 Feb 2022 15:35:48 +0000
Subject: [PATCH] refactor forkchoiceUpdated response type

---
 web3/conversions.nim      | 10 ----------
 web3/engine_api_types.nim |  8 +-------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/web3/conversions.nim b/web3/conversions.nim
index a805f52..e69c6c1 100644
--- a/web3/conversions.nim
+++ b/web3/conversions.nim
@@ -73,16 +73,6 @@ func getEnumStringTable(enumType: typedesc): Table[string, enumType] {.compileTi
     res[$value] = value
   res
 
-proc fromJson*(
-    n: JsonNode, argName: string, result: var ForkchoiceUpdatedStatus) {.inline.} =
-  n.kind.expect(JString, argName)
-  const enumStrings = static: getEnumStringTable(type(result))
-  try:
-    result = enumStrings[n.getStr]
-  except KeyError:
-    raise newException(
-      ValueError, "Parameter \"" & argName & "\" value invalid: " & n.getStr)
-
 proc fromJson*(
     n: JsonNode, argName: string, result: var PayloadExecutionStatus) {.inline.} =
   n.kind.expect(JString, argName)
diff --git a/web3/engine_api_types.nim b/web3/engine_api_types.nim
index 499fc59..133b92e 100644
--- a/web3/engine_api_types.nim
+++ b/web3/engine_api_types.nim
@@ -33,16 +33,10 @@ type
     finalizedBlockHash*: BlockHash
 
   # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.6/src/engine/specification.md#response-1
-  ForkchoiceUpdatedStatus* {.pure.} = enum
-    valid                  = "VALID"
-    invalid                = "INVALID"
-    syncing                = "SYNCING"
-    invalid_terminal_block = "INVALID_TERMINAL_BLOCK"
-
   PayloadID* = FixedBytes[8]
 
   ForkchoiceUpdatedResponse* = object
-    payloadStatus*: ForkchoiceUpdatedStatus
+    payloadStatus*: PayloadStatusV1
     payloadId*: Option[PayloadID]
 
 const