From d42833947a4baddf21da8ac3105e2d5956a6daac Mon Sep 17 00:00:00 2001
From: Dmitriy Ryajov <dryajov@gmail.com>
Date: Thu, 9 Jan 2020 21:59:27 -0600
Subject: [PATCH] fix gossipsub mesh test

---
 tests/pubsub/testgossipsub.nim | 45 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/tests/pubsub/testgossipsub.nim b/tests/pubsub/testgossipsub.nim
index d397e9b31..bd68be697 100644
--- a/tests/pubsub/testgossipsub.nim
+++ b/tests/pubsub/testgossipsub.nim
@@ -7,7 +7,7 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-import unittest, sequtils, options, tables, sets, heapqueue
+import unittest, sequtils, options, tables, sets
 import chronos
 import utils, ../../libp2p/[peer,
                             peerinfo,
@@ -391,32 +391,33 @@ suite "GossipSub":
   #   check:
   #     waitFor(runTests()) == true
 
-  # test "e2e - GossipSub send over mesh A -> B":
-  #   proc runTests(): Future[bool] {.async.} =
-  #     var passed: Future[bool] = newFuture[bool]()
-  #     proc handler(topic: string, data: seq[byte]) {.async, gcsafe.} =
-  #       check topic == "foobar"
-  #       passed.complete(true)
+  test "e2e - GossipSub send over mesh A -> B":
+    proc runTests(): Future[bool] {.async.} =
+      var passed: Future[bool] = newFuture[bool]()
+      proc handler(topic: string, data: seq[byte]) {.async, gcsafe.} =
+        check topic == "foobar"
+        passed.complete(true)
 
-  #     var nodes = generateNodes(2, true)
-  #     var wait: seq[Future[void]]
-  #     wait.add(await nodes[0].start())
-  #     wait.add(await nodes[1].start())
+      var nodes = generateNodes(2, true)
+      var wait: seq[Future[void]]
+      wait.add(await nodes[0].start())
+      wait.add(await nodes[1].start())
 
-  #     await nodes[0].subscribe("foobar", handler)
-  #     await nodes[1].subscribe("foobar", handler)
+      await subscribeNodes(nodes)
+      await sleepAsync(100.millis)
 
-  #     await nodes[0].subscribeToPeer(nodes[1].peerInfo)
-  #     await sleepAsync(100.millis)
+      await nodes[1].subscribe("foobar", handler)
+      await sleepAsync(100.millis)
 
-  #     await nodes[0].publish("foobar", cast[seq[byte]]("Hello!"))
-  #     result = await passed
-  #     await nodes[1].stop()
-  #     await allFutures(wait)
+      await nodes[0].publish("foobar", cast[seq[byte]]("Hello!"))
+      result = await passed
 
-  #   check:
-  #     waitFor(runTests()) == true
-  #   getGlobalDispatcher().timers.clear()
+      await nodes[0].stop()
+      await nodes[1].stop()
+      await allFutures(wait)
+
+    check:
+      waitFor(runTests()) == true
 
   # test "with multiple peers":
   #   proc runTests(): Future[bool] {.async.} =