From 2982fd5f2298192b96b7563ee875b0d882cc48ef Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 14 Mar 2019 12:23:29 -0700
Subject: [PATCH 1/2] test: add circuit reconnect test

@whyrusleeping noticed a bug where this didn't appear to work. I can't reproduce
but this is still a useful test to have.
---
 test/circuit.js       | 14 ++++++++++++++
 test/utils/circuit.js | 10 +++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/circuit.js b/test/circuit.js
index 9ba273ba..2f829799 100644
--- a/test/circuit.js
+++ b/test/circuit.js
@@ -15,10 +15,12 @@ const browser = require('./circuit/browser')
 const isNode = require('detect-node')
 const send = require('./utils/circuit').send
 const connect = require('./utils/circuit').connect
+const disconnect = require('./utils/circuit').disconnect
 
 const timeout = 80 * 1000
 const baseTest = {
   connect,
+  disconnect,
   send,
   timeout
 }
@@ -65,6 +67,18 @@ describe('circuit', () => {
       it('send', (done) => {
         tests[test].send(nodeA.ipfsd.api, nodeB.ipfsd.api, done)
       })
+
+      it('disconnect', (done) => {
+        tests[test].disconnect(nodeA, nodeB, done)
+      })
+
+      it('reconnect', (done) => {
+        tests[test].connect(nodeA, nodeB, relay, done)
+      })
+
+      it('resend', (done) => {
+        tests[test].send(nodeA.ipfsd.api, nodeB.ipfsd.api, done)
+      })
     })
   })
 })
diff --git a/test/utils/circuit.js b/test/utils/circuit.js
index 7c1e9ef6..16c2c160 100644
--- a/test/utils/circuit.js
+++ b/test/utils/circuit.js
@@ -95,8 +95,8 @@ exports.createGoNode = (addrs, callback) => {
   })
 }
 
-const data = crypto.randomBytes(128)
 exports.send = (nodeA, nodeB, callback) => {
+  const data = crypto.randomBytes(128)
   waterfall([
     (cb) => nodeA.add(data, cb),
     (res, cb) => nodeB.cat(res[0].hash, cb),
@@ -161,3 +161,11 @@ exports.connWithTimeout = (timeout) => {
     connect(nodeA, nodeB, relay, timeout, callback)
   }
 }
+
+const disconnect = (nodeA, nodeB, callback) => {
+  series([
+    (cb) => nodeA.ipfsd.api.swarm.disconnect(getCircuitAddr(nodeB.addrs), cb)
+  ], callback)
+}
+
+exports.disconnect = disconnect

From bc43258491dd099c814cc2a4bc6de10cdba1d136 Mon Sep 17 00:00:00 2001
From: Alan Shaw <alan.shaw@protocol.ai>
Date: Mon, 15 Apr 2019 13:29:30 +0100
Subject: [PATCH 2/2] refactor: rmeove unnecessary series

---
 test/utils/circuit.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/utils/circuit.js b/test/utils/circuit.js
index 16c2c160..2e33808b 100644
--- a/test/utils/circuit.js
+++ b/test/utils/circuit.js
@@ -163,9 +163,7 @@ exports.connWithTimeout = (timeout) => {
 }
 
 const disconnect = (nodeA, nodeB, callback) => {
-  series([
-    (cb) => nodeA.ipfsd.api.swarm.disconnect(getCircuitAddr(nodeB.addrs), cb)
-  ], callback)
+  nodeA.ipfsd.api.swarm.disconnect(getCircuitAddr(nodeB.addrs), callback)
 }
 
 exports.disconnect = disconnect