cleanup imports after rebase, fix toJson

codex/rest/api.nim

@@ -32,6 +32,7 @@ import ../node
 import ../blocktype
 import ../conf
 import ../contracts
+import ../manifest
 import ../streams/asyncstreamwrapper
 
 import ./coders

codex/rest/json.nim

@@ -6,7 +6,6 @@ import pkg/codexdht/discv5/routing_table as rt
 import ../sales
 import ../purchasing
 import ../utils/json
-import ../units
 import ../manifest
 
 export json

codex/sales/reservations.nim

@@ -28,7 +28,7 @@ push: {.upraises: [].}
 
 import std/typetraits
 import pkg/chronos
-import pkg/chronicles
+import pkg/chronicles except toJson
 import pkg/datastore
 import pkg/nimcrypto
 import pkg/questionable

codex/utils/json.nim

@@ -303,18 +303,7 @@ func `%`*[T: distinct](id: T): JsonNode =
   type baseType = T.distinctBase
   % baseType(id)
 
-func toJson*(obj: object): string = $(%obj)
-func toJson*(obj: ref object): string = $(%obj)
-
-func toJson*[T: object](elements: openArray[T]): string =
-  let jObj = newJArray()
-  for elem in elements: jObj.add(%elem)
-  $jObj
-
-func toJson*[T: ref object](elements: openArray[T]): string =
-  let jObj = newJArray()
-  for elem in elements: jObj.add(%elem)
-  $jObj
+func toJson*[T](item: T): string = $(%item)
 
 proc toJsnImpl(x: NimNode): NimNode =
   case x.kind

tests/codex/utils/testjson.nim

@@ -3,7 +3,7 @@ import std/options
 import std/strformat
 import std/strutils
 import std/unittest
-import pkg/chronicles
+import pkg/chronicles except toJson
 import pkg/stew/byteutils
 import pkg/stint
 import pkg/codex/contracts/requests