fix: tests

Author: richard-ramos

libp2p.nimble

@@ -11,7 +11,7 @@ requires "nim >= 1.6.0",
   "nimcrypto >= 0.6.0 & < 0.7.0", "dnsclient >= 0.3.0 & < 0.4.0", "bearssl >= 0.2.5",
   "chronicles >= 0.10.2", "chronos >= 4.0.3", "metrics", "secp256k1", "stew#head",
   "websock", "unittest2",
-  "https://github.com/status-im/nim-quic.git#v0.2.0",
+  "https://github.com/status-im/nim-quic.git#f5f13c441a60ed54f37e656616c8cd3346cc46f5",
   "https://github.com/status-im/nim-mbedtls.git"
 
 let nimc = getEnv("NIMC", "nim") # Which nim compiler to use

libp2p/transports/quictransport.nim

@@ -209,8 +209,8 @@ method stop*(transport: QuicTransport) {.async: (raises: []).} =
     transport.listener = nil
 
 proc wrapConnection(
-    transport: QuicTransport, connection: QuicConnection, dir: Direction
-): Future[QuicStream] {.async: (raises: [TransportOsError, LPError]).} =
+    transport: QuicTransport, connection: QuicConnection
+): QuicSession {.raises: [TransportOsError, LPError].} =
   let
     remoteAddr = connection.remoteAddress()
     observedAddr =
@@ -220,8 +220,6 @@ proc wrapConnection(
 
   session.initStream()
 
-  let stream = session.getStream(dir)
-
   transport.connections.add(session)
 
   proc onClose() {.async: (raises: []).} =
@@ -231,7 +229,7 @@ proc wrapConnection(
 
   asyncSpawn onClose()
 
-  return await stream
+  return session
 
 method accept*(
     self: QuicTransport
@@ -241,7 +239,7 @@ method accept*(
   doAssert not self.listener.isNil, "call start() before calling accept()"
   try:
     let connection = await self.listener.accept()
-    return await self.wrapConnection(connection, Direction.Out)
+    return self.wrapConnection(connection)
   except CancelledError as e:
     raise e
   except CatchableError as e:
@@ -257,7 +255,7 @@ method dial*(
 .} =
   try:
     let quicConnection = await self.client.dial(initTAddress(address).tryGet)
-    return await self.wrapConnection(quicConnection, Direction.In)
+    return self.wrapConnection(quicConnection)
   except CancelledError as e:
     raise e
   except CatchableError as e:

tests/testquic.nim

@@ -23,9 +23,11 @@ suite "Quic transport":
     await transport1.start(ma)
     check transport1.handles(transport1.addrs[0])
     await transport1.stop()
-#
+  #
   asyncTest "transport e2e":
-    let serverMA = @[MultiAddress.init("/ip4/127.0.0.1/udp/50001/quic-v1").tryGet()] # todo: HANDLE 0 port
+    let serverMA =
+      @[MultiAddress.init("/ip4/127.0.0.1/udp/50001/quic-v1").tryGet()]
+        # todo: HANDLE 0 port
     let privateKey = PrivateKey.random(ECDSA, (newRng())[]).tryGet()
     let server: QuicTransport = QuicTransport.new(Upgrade(), privateKey)
     await server.start(serverMA)
@@ -34,24 +36,24 @@ suite "Quic transport":
       let privateKey = PrivateKey.random(ECDSA, (newRng())[]).tryGet()
       let client: QuicTransport = QuicTransport.new(Upgrade(), privateKey)
       let conn = await client.dial("", server.addrs[0])
-      await conn.write("client")
+      let stream = await getStream(QuicSession(conn), Direction.Out)
+      await stream.write("client")
       var resp: array[6, byte]
-      await conn.readExactly(addr resp, 6)
-      await conn.close()
-
+      await stream.readExactly(addr resp, 6)
+      await stream.close()
       check string.fromBytes(resp) == "server"
       await client.stop()
 
     proc serverAcceptHandler() {.async.} =
       let conn = await server.accept()
+      let stream = await getStream(QuicSession(conn), Direction.In)
       var resp: array[6, byte]
-      await conn.readExactly(addr resp, 6)
+      await stream.readExactly(addr resp, 6)
       check string.fromBytes(resp) == "client"
 
-      await conn.write("server")
-      await conn.close()
+      await stream.write("server")
+      await stream.close()
       await server.stop()
 
-
     asyncSpawn serverAcceptHandler()
     await runClient()