Merge rpcsocket into rpcserver

rpcserver.nim

@@ -1,2 +1,2 @@
-import json_rpc / server
-export server
+import json_rpc / server, json_rpc / transports / socket
+export server, socket

rpcsocket.nim

@@ -1,2 +0,0 @@
-import json_rpc / server, json_rpc / transports / socket
-export server, socket

tests/testerrors.nim

@@ -3,7 +3,7 @@
   allow unchecked and unformatted calls.
 ]#
 
-import unittest, debugclient, ../rpcsocket
+import unittest, debugclient, ../rpcserver
 import strformat, chronicles
 
 var server = newRpcSocketServer("localhost", 8547.Port)

tests/testethcalls.nim

@@ -1,5 +1,5 @@
 import unittest, json, tables
-import ../rpcclient, ../rpcsocket
+import ../rpcclient, ../rpcserver
 import stint, ethtypes, ethprocs, stintjson, nimcrypto, ethhexstrings, chronicles
 
 from os import getCurrentDir, DirSep

tests/testrpcmacro.nim

@@ -1,5 +1,5 @@
 import unittest, json, tables, chronicles
-import ../rpcsocket
+import ../rpcserver
 
 type
   # some nested types to check object parsing

tests/testserverclient.nim

@@ -1,5 +1,5 @@
 import unittest, json, chronicles
-import  ../rpcclient, ../rpcsocket
+import  ../rpcclient, ../rpcserver
 
 var srv = newRpcSocketServer(["localhost:8545"])
 var client = newRpcStreamClient()