Merge branch 'devel' of https://github.com/Araq/Nimrod into devel

3 files changed, 6 insertions, 8 deletions

diff --git a/tests/async/tasyncawait.nim b/tests/async/tasyncawait.nim
index 5165b0f06..13d531387 100644
--- a/tests/async/tasyncawait.nim
+++ b/tests/async/tasyncawait.nim
@@ -53,9 +53,7 @@ proc createServer(port: TPort) {.async.} =
   
   discard server.SocketHandle.listen()
   while true:
-    var client = await accept(server)
-    asyncCheck readMessages(client)
-    # TODO: Test: readMessages(disp, await disp.accept(server))
+    asyncCheck readMessages(await accept(server))
 
 asyncCheck createServer(TPort(10335))
 asyncCheck launchSwarm(TPort(10335))
diff --git a/tests/async/tasynciossl.nim b/tests/async/tasynciossl.nim
index b0222e4ff..118b9e74d 100644
--- a/tests/async/tasynciossl.nim
+++ b/tests/async/tasynciossl.nim
@@ -47,7 +47,7 @@ proc serverAccept(s: PAsyncSocket) =
 proc launchSwarm(disp: var PDispatcher, port: TPort, count: int,
                  buffered = true, useSSL = false) =
   for i in 1..count:
-    var client = AsyncSocket()
+    var client = asyncSocket()
     when defined(ssl):
       if useSSL:
         ctx1.wrapSocket(client)
@@ -56,7 +56,7 @@ proc launchSwarm(disp: var PDispatcher, port: TPort, count: int,
     client.connect("localhost", port)
 
 proc createSwarm(port: TPort, buffered = true, useSSL = false) =
-  var server = AsyncSocket()
+  var server = asyncSocket()
   when defined(ssl):
     if useSSL:
       ctx.wrapSocket(server)
diff --git a/tests/async/tasyncudp.nim b/tests/async/tasyncudp.nim
index fd7f3d568..2a7ed40bf 100644
--- a/tests/async/tasyncudp.nim
+++ b/tests/async/tasyncudp.nim
@@ -42,14 +42,14 @@ proc swarmConnect(s: PAsyncSocket) =
 proc createClient(disp: var PDispatcher, port: TPort,
                   buffered = true) =
   currentClient.inc()
-  var client = AsyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
+  var client = asyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
                            buffered = buffered)
   client.handleConnect = swarmConnect
   disp.register(client)
   client.connect("localhost", port)
 
 proc createServer(port: TPort, buffered = true) =
-  var server = AsyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
+  var server = asyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
                            buffered = buffered)
   server.handleRead = serverRead
   disp.register(server)
@@ -75,4 +75,4 @@ while true:
     break
 
 assert msgCount == messagesToSend * serverCount * swarmSize
-echo(msgCount)
\ No newline at end of file
+echo(msgCount)