Move RestError declaration to common. (#7)

status-im · May 14, 2021 · 37b25ea · 37b25ea
1 parent db39cdc
commit 37b25ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/presto/client.nim b/presto/client.nim
@@ -42,19 +42,6 @@ type
   RestReturnKind {.pure.} = enum
     Status, PlainResponse, GenericResponse, Value
 
-  RestDefect* = object of Defect
-  RestError* = object of CatchableError
-  RestEncodingError* = object of RestError
-    field*: cstring
-  RestDecodingError* = object of RestError
-  RestCommunicationError* = object of RestError
-    exc*: ref HttpError
-  RestRedirectionError* = object of RestError
-  RestResponseError* = object of RestError
-    status*: int
-    contentType*: string
-    message*: string
-
 const
   RestContentTypeArg = "restContentType"
   RestAcceptTypeArg = "restAcceptType"

diff --git a/presto/common.nim b/presto/common.nim
@@ -42,6 +42,20 @@ type
 
   ByteChar* = string | seq[byte]
 
+  RestDefect* = object of Defect
+  RestError* = object of CatchableError
+  RestBadRequestError* = object of RestError
+  RestEncodingError* = object of RestError
+    field*: cstring
+  RestDecodingError* = object of RestError
+  RestCommunicationError* = object of RestError
+    exc*: ref HttpError
+  RestRedirectionError* = object of RestError
+  RestResponseError* = object of RestError
+    status*: int
+    contentType*: string
+    message*: string
+
 proc error*(t: typedesc[RestApiResponse],
             status: HttpCode = Http200, msg: string = "",
             contentType: string = "text/html"): RestApiResponse =

diff --git a/presto/servercommon.nim b/presto/servercommon.nim
@@ -32,6 +32,3 @@ chronicles.expandIt(RestApiError):
 type
   RestServerState* {.pure.} = enum
     Closed, Stopped, Running
-
-  RestError* = object of CatchableError
-  RestBadRequestError* = object of RestError