From fcd0eadadde0ee000a63df8ab21dc4e9f015a790 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Mon, 16 Aug 2021 08:52:41 +0200
Subject: [PATCH] clean up imports, unittest2

---
 .gitignore                              | 2 ++
 serialization.nim                       | 8 ++++----
 serialization.nimble                    | 1 +
 serialization/object_serialization.nim  | 2 +-
 serialization/testing/generic_suite.nim | 3 ++-
 tests/test_object_serialization.nim     | 4 +++-
 6 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..24e9d9e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+nimcache/
+tests/test_all
diff --git a/serialization.nim b/serialization.nim
index aa066ee..2f07dc7 100644
--- a/serialization.nim
+++ b/serialization.nim
@@ -1,10 +1,10 @@
 import
-  typetraits,
-  stew/shims/macros, faststreams,
-  serialization/[object_serialization, errors, formats]
+  std/typetraits,
+  stew/shims/macros, faststreams/[inputs, outputs],
+  ./serialization/[object_serialization, errors, formats]
 
 export
-  faststreams, object_serialization, errors, formats
+  inputs, outputs, object_serialization, errors, formats
 
 template encode*(Format: type, value: auto, params: varargs[untyped]): auto =
   mixin init, Writer, writeValue, PreferredOutputType
diff --git a/serialization.nimble b/serialization.nimble
index 38c5ae0..9d6ff04 100644
--- a/serialization.nimble
+++ b/serialization.nimble
@@ -9,6 +9,7 @@ skipDirs      = @["tests"]
 
 requires "nim >= 1.2.0",
          "faststreams",
+         "unittest2",
          "stew"
 
 task test, "Run all tests":
diff --git a/serialization/object_serialization.nim b/serialization/object_serialization.nim
index 0d65097..a716084 100644
--- a/serialization/object_serialization.nim
+++ b/serialization/object_serialization.nim
@@ -1,6 +1,6 @@
 import
   stew/shims/macros, stew/objects,
-  errors
+  ./errors
 
 type
   DefaultFlavor* = object
diff --git a/serialization/testing/generic_suite.nim b/serialization/testing/generic_suite.nim
index dae0556..f86ab31 100644
--- a/serialization/testing/generic_suite.nim
+++ b/serialization/testing/generic_suite.nim
@@ -1,5 +1,6 @@
 import
-  unittest, times, typetraits, random, strutils, options, sets, tables,
+  std/[times, typetraits, random, strutils, options, sets, tables],
+  unittest2,
   faststreams/inputs,
   ../../serialization, ../object_serialization
 
diff --git a/tests/test_object_serialization.nim b/tests/test_object_serialization.nim
index 1ca35cd..5cf86d5 100644
--- a/tests/test_object_serialization.nim
+++ b/tests/test_object_serialization.nim
@@ -1,9 +1,11 @@
 import
-  typetraits, unittest,
+  typetraits, unittest2,
   stew/shims/macros, stew/objects,
   ../serialization/object_serialization,
   ../serialization/testing/generic_suite
 
+{.used.}
+
 suite "object serialization":
   setup:
     var fieldsList = newSeq[string]()