Add tests

Author: jangko

tests/test_json_marshalling.nim

@@ -35,6 +35,11 @@ proc rand(_: type uint64): uint64 =
   discard randomBytes(res)
   uint64.fromBytesBE(res)
 
+proc rand(_: type int): int =
+  var res: array[sizeof(result), byte]
+  discard randomBytes(res)
+  copyMem(result.addr, res[0].addr, sizeof(result))
+
 proc rand[T: Quantity](_: type T): T =
   var res: array[sizeof(T), byte]
   discard randomBytes(res)
@@ -105,6 +110,9 @@ proc rand(_: type seq[seq[byte]]): seq[seq[byte]] =
   discard randomBytes(z)
   @[z, z, z]
 
+proc rand(_: type Table[Hash32, Hash32]): Table[Hash32, Hash32] =
+  result[Hash32.rand()] = Hash32.rand()
+
 proc rand[T](_: type SingleOrList[T]): SingleOrList[T] =
   SingleOrList[T](kind: slkSingle, single: rand(T))
 
@@ -235,6 +243,14 @@ suite "JSON-RPC Quantity":
     checkRandomObject(EthConfigObject)
     checkRandomObject(StorageValuesRequest)
 
+    checkRandomObject(OverrideAccount)
+    checkRandomObject(BlockOverrides)
+    checkRandomObject(BlockStateCall)
+    checkRandomObject(SimulationRequest)
+    checkRandomObject(CallError)
+    checkRandomObject(SimulateCallResult)
+    checkRandomObject(SimulateBlockResult)
+
   test "check blockId":
     let a = RtBlockIdentifier(kind: bidNumber, number: 77.Quantity)
     let x = EthJson.encode(a)

web3/conversions.nim

@@ -41,6 +41,7 @@ EthJson.automaticSerialization(seq, true)
 EthJson.automaticSerialization(bool, true)
 EthJson.automaticSerialization(float64, true)
 EthJson.automaticSerialization(array, true)
+EthJson.automaticSerialization(int, true)
 
 #------------------------------------------------------------------------------
 # eth_api_types
@@ -66,6 +67,14 @@ BlobScheduleObject.useDefaultSerializationIn EthJson
 ConfigObject.useDefaultSerializationIn EthJson
 EthConfigObject.useDefaultSerializationIn EthJson
 
+OverrideAccount.useDefaultSerializationIn EthJson
+BlockOverrides.useDefaultSerializationIn EthJson
+BlockStateCall.useDefaultSerializationIn EthJson
+SimulationRequest.useDefaultSerializationIn EthJson
+CallError.useDefaultSerializationIn EthJson
+SimulateCallResult.useDefaultSerializationIn EthJson
+SimulateBlockResult.useDefaultSerializationIn EthJson
+
 #------------------------------------------------------------------------------
 # engine_api_types
 #------------------------------------------------------------------------------
@@ -565,6 +574,18 @@ proc writeValue*(w: var JsonWriter[EthJson], v: StorageValuesRequest)
     w.writeMember(x.address.to0xHex, x.data)
   w.endObject()
 
+proc writeValue*(w: var JsonWriter[EthJson], v: Table[Hash32, Hash32])
+      {.gcsafe, raises: [IOError].} =
+  w.beginObject()
+  for k, val in v:
+    w.writeMember(k.to0xHex, val)
+  w.endObject()
+
+proc readValue*(r: var JsonReader[EthJson], val: var Table[Hash32, Hash32])
+       {.gcsafe, raises: [IOError, SerializationError].} =
+  for k,v in readObject(r, Hash32, Hash32):
+    val[k] = v
+
 func `$`*(v: Quantity): string {.inline.} =
   encodeQuantity(distinctBase(v))