From 0e12edd107faf8fbc576df2c13b20e402f94ae6c Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Tue, 2 Jun 2020 11:18:55 +0800
Subject: [PATCH] Quicksim failing example

---
 waku/node/v2/quicksim.nim      | 81 ++++++++++++++++++++++------------
 waku/node/v2/start_network.nim |  8 ++++
 2 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/waku/node/v2/quicksim.nim b/waku/node/v2/quicksim.nim
index e72d555ef..17a4c6ab6 100644
--- a/waku/node/v2/quicksim.nim
+++ b/waku/node/v2/quicksim.nim
@@ -13,37 +13,62 @@ createRpcSigs(RpcHttpClient, sigWakuPath)
 
 const topicAmount = 100
 
-let node1 = newRpcHttpClient()
-let node2 = newRpcHttpClient()
-let node3 = newRpcHttpClient()
-let node4 = newRpcHttpClient()
-let node5 = newRpcHttpClient()
-let node6 = newRpcHttpClient()
-
-waitFor node1.connect("localhost", Port(8547))
-waitFor node2.connect("localhost", Port(8548))
-waitFor node3.connect("localhost", Port(8549))
-waitFor node4.connect("localhost", Port(8550))
-waitFor node5.connect("localhost", Port(8551))
-waitFor node6.connect("localhost", Port(8552))
-
-let version = waitFor node6.wakuVersion()
-info "Version is", version
-
 proc handler(topic: string, data: seq[byte]) {.async, gcsafe.} =
   debug "Hit handler", topic=topic, data=data
 
-# TODO: Implement handler logic
-# All subscribing to foobar topic
-let res2 = waitFor node2.wakuSubscribe("foobar")
-let res3 = waitFor node3.wakuSubscribe("foobar")
-let res4 = waitFor node4.wakuSubscribe("foobar")
-let res5 = waitFor node5.wakuSubscribe("foobar")
-let res6 = waitFor node6.wakuSubscribe("foobar")
+# All full nodes connected etc
+#
+# let node1 = newRpcHttpClient()
+# let node2 = newRpcHttpClient()
+# let node3 = newRpcHttpClient()
+# let node4 = newRpcHttpClient()
+# let node5 = newRpcHttpClient()
+# let node6 = newRpcHttpClient()
+
+# waitFor node1.connect("localhost", Port(8547))
+# waitFor node2.connect("localhost", Port(8548))
+# waitFor node3.connect("localhost", Port(8549))
+# waitFor node4.connect("localhost", Port(8550))
+# waitFor node5.connect("localhost", Port(8551))
+# waitFor node6.connect("localhost", Port(8552))
+
+# let version = waitFor node6.wakuVersion()
+# info "Version is", version
+
+# # TODO: Implement handler logic
+# # All subscribing to foobar topic
+# let res2 = waitFor node2.wakuSubscribe("foobar")
+# let res3 = waitFor node3.wakuSubscribe("foobar")
+# let res4 = waitFor node4.wakuSubscribe("foobar")
+# let res5 = waitFor node5.wakuSubscribe("foobar")
+# let res6 = waitFor node6.wakuSubscribe("foobar")
+# os.sleep(2000)
+
+# # info "Posting envelopes on all subscribed topics"
+# for i in 0..<topicAmount:
+#   os.sleep(50)
+#   let res2 = waitFor node1.wakuPublish("foobar", "hello world")
+
+# os.sleep(2000)
+
+# for i in 0..<topicAmount:
+#   os.sleep(50)
+#   let res2 = waitFor node1.wakuPublish("foobar", "hello world2")
+
+let nodea = newRpcHttpClient()
+let nodeb = newRpcHttpClient()
+
+waitFor nodea.connect("localhost", Port(8545))
+waitFor nodeb.connect("localhost", Port(8546))
+
+let version = waitFor nodea.wakuVersion()
+info "Version is", version
+
+let res1 = waitFor nodea.wakuSubscribe("foobar")
+let res2 = waitFor nodeb.wakuSubscribe("foobar")
+
 os.sleep(2000)
 
-# info "Posting envelopes on all subscribed topics"
 for i in 0..<topicAmount:
-  let res2 = waitFor node1.wakuPublish("foobar", "hello world")
-
-os.sleep(2000)
+  os.sleep(50)
+  let res3 = waitFor nodea.wakuPublish("foobar", "hello world")
diff --git a/waku/node/v2/start_network.nim b/waku/node/v2/start_network.nim
index ed62e4d1e..ca11b112d 100644
--- a/waku/node/v2/start_network.nim
+++ b/waku/node/v2/start_network.nim
@@ -94,6 +94,14 @@ when isMainModule:
     staticnodes.add(nodes[i].address)
 
   # TODO: Here we could add a light node, but not clear thats what we want to test?
+  # Lets call them edge nodes
+  # NOTE: Only connecting to one node here
+  var nodesubseta: seq[string]
+  var nodesubsetb: seq[string]
+  nodesubseta.add(staticnodes[0])
+  nodesubsetb.add(staticnodes[amount-1])
+  nodes.add(initNodeCmd(0, nodesubseta, label = "edge node (A)"))
+  nodes.add(initNodeCmd(1, nodesubsetb, label = "edge node (B)"))
 
   var commandStr = "multitail -s 2 -M 0 -x \"Waku Simulation\""
   var count = 0