From 9ebf3990fdc8ccc9c3c35f8383eb3178fba00f70 Mon Sep 17 00:00:00 2001
From: coffeepots <ryan@status.im>
Date: Tue, 10 Apr 2018 18:41:12 +0100
Subject: [PATCH] Merged tests into one file to run with CI

---
 tests/testserver.nim                           | 11 -----------
 tests/{testclient.nim => testserverclient.nim} |  7 +++++--
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 tests/testserver.nim
 rename tests/{testclient.nim => testserverclient.nim} (74%)

diff --git a/tests/testserver.nim b/tests/testserver.nim
deleted file mode 100644
index 973b84a..0000000
--- a/tests/testserver.nim
+++ /dev/null
@@ -1,11 +0,0 @@
-import ../eth-rpc/rpcserver, asyncdispatch
-
-when isMainModule:
-  echo "Initialising server..."
-  # create on localhost, default port
-  var srv = newRpcServer("")
-  echo "Server started."
-  asyncCheck srv.serve()
-  runForever()
-
-  echo "Server stopped."
\ No newline at end of file
diff --git a/tests/testclient.nim b/tests/testserverclient.nim
similarity index 74%
rename from tests/testclient.nim
rename to tests/testserverclient.nim
index 9757867..62d2d01 100644
--- a/tests/testclient.nim
+++ b/tests/testserverclient.nim
@@ -1,6 +1,10 @@
-import ../eth-rpc/rpcclient, asyncdispatch, json, unittest
+import ../eth-rpc / rpcclient, ../eth-rpc / rpcserver, asyncdispatch, json, unittest
 
 when isMainModule:
+  # create on localhost, default port
+  var srv = newRpcServer("")
+  asyncCheck srv.serve()
+
   suite "RPC":
     proc main {.async.} =
       var client = newRpcClient()
@@ -15,4 +19,3 @@ when isMainModule:
         check response.result.getStr == "3A985DA74FE225B2045C172D6BD390BD855F086E3E9D525B46BFE24511431532"
 
     waitFor main()
-  echo "Finished."
\ No newline at end of file