diff --git a/codex/rest/api.nim b/codex/rest/api.nim index 88b1b4df..97e29a0a 100644 --- a/codex/rest/api.nim +++ b/codex/rest/api.nim @@ -32,6 +32,7 @@ import ../node import ../blocktype import ../conf import ../contracts +import ../manifest import ../streams/asyncstreamwrapper import ./coders diff --git a/codex/rest/json.nim b/codex/rest/json.nim index f23fbff2..c7892aa7 100644 --- a/codex/rest/json.nim +++ b/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 diff --git a/codex/sales/reservations.nim b/codex/sales/reservations.nim index ed414594..001d6a5a 100644 --- a/codex/sales/reservations.nim +++ b/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 diff --git a/codex/utils/json.nim b/codex/utils/json.nim index 810dcddb..ade6936d 100644 --- a/codex/utils/json.nim +++ b/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 diff --git a/tests/codex/utils/testjson.nim b/tests/codex/utils/testjson.nim index 77fed8e2..e939feea 100644 --- a/tests/codex/utils/testjson.nim +++ b/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