From 9edc823b6c4f49a0e3154bec0cb919e4c4963020 Mon Sep 17 00:00:00 2001
From: cheatfate <ka@hardcore.kiev.ua>
Date: Thu, 22 Nov 2018 17:35:44 +0200
Subject: [PATCH] Some fixes to chat, and one more test for bad cid provide.

---
 examples/chat.nim    | 19 +++++++++++++++++--
 tests/testdaemon.nim | 12 ++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/examples/chat.nim b/examples/chat.nim
index 466bd45b4..a69abb6d1 100644
--- a/examples/chat.nim
+++ b/examples/chat.nim
@@ -25,6 +25,14 @@ proc serveThread(server: StreamServer,
   ## This procedure perform readin on local unix domain socket and
   ## sends data to remote clients.
   var udata = getUserData[CustomData](server)
+
+  proc remoteReader(transp: StreamTransport) {.async.} =
+    while true:
+      var line = await transp.readLine()
+      if len(line) == 0:
+        break
+      echo ">> ", line
+
   while true:
     try:
       var line = await transp.readLine()
@@ -34,15 +42,19 @@ proc serveThread(server: StreamServer,
           var address = fromHex(parts[1])
           echo "= Searching for peer ", toHex(address)
           var id = await udata.api.dhtFindPeer(address)
+          echo "==="
+          echo repr id
+          echo "==="
           echo "= Connecting to peer ", toHex(address)
           await udata.api.connect(id.peer, id.addresses)
           echo "= Opening stream to peer chat ", toHex(address)
           var stream = await udata.api.openStream(id.peer, ServerProtocols)
-          udata.remotes.add(transp)
+          udata.remotes.add(stream.transp)
           echo "= Connected to peer chat ", toHex(address)
+          asyncCheck remoteReader(stream.transp)
       else:
         var msg = line & "\r\n"
-        echo "<< ", msg
+        echo "<< ", line
         var pending = newSeq[Future[int]]()
         for item in udata.remotes:
           pending.add(item.write(msg))
@@ -68,8 +80,11 @@ proc main() {.async.} =
 
   proc streamHandler(api: DaemonAPI, stream: P2PStream) {.async.} =
     echo "= Peer ", toHex(stream.peer), " joined chat"
+    data.remotes.add(stream.transp)
     while true:
       var line = await stream.transp.readLine()
+      if len(line) == 0:
+        break
       echo ">> ", line
 
   await data.api.addHandler(ServerProtocols, streamHandler)
diff --git a/tests/testdaemon.nim b/tests/testdaemon.nim
index cd72f447f..4e71b1819 100644
--- a/tests/testdaemon.nim
+++ b/tests/testdaemon.nim
@@ -35,6 +35,15 @@ proc connectStreamTest(): Future[bool] {.async.} =
   await api2.close()
   result = true
 
+proc provideBadCidTest(): Future[bool] {.async.} =
+  var cid = newSeq[byte](10)
+  var api = await newDaemonApi({DHTFull})
+  try:
+    await api.dhtProvide(cid)
+    result = false
+  except DaemonRemoteError:
+    result = true
+
 when isMainModule:
   suite "libp2p-daemon test suite":
     test "Simple spawn and get identity test":
@@ -43,3 +52,6 @@ when isMainModule:
     test "Connect/Accept peer/stream test":
       check:
         waitFor(connectStreamTest()) == true
+    test "DHT provide bad CID test":
+      check:
+        waitFor(provideTestBadCid()) == true