From 127be58017159c1d4f96b97175ae0564340ce4bf Mon Sep 17 00:00:00 2001
From: Victor Bjelkholm <victorbjelkholm@gmail.com>
Date: Thu, 19 Jan 2017 14:07:37 +0100
Subject: [PATCH] Refactor of test-case

---
 src/close-test.js | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/close-test.js b/src/close-test.js
index 3c1161d..fab1114 100644
--- a/src/close-test.js
+++ b/src/close-test.js
@@ -14,13 +14,11 @@ const multiaddr = require('multiaddr')
 
 const mh = multiaddr('/ip4/127.0.0.1/tcp/10000')
 
-function closeAndWait (stream) {
+function closeAndWait (stream, callback) {
   pull(
     pull.empty(),
     stream,
-    pull.onEnd((err) => {
-      expect(err).to.not.exist.mark()
-    })
+    pull.onEnd(() => callback())
   )
 }
 
@@ -36,38 +34,37 @@ module.exports = (common) => {
       })
     })
 
-    it('closing underlying closes streams (tcp)', (done) => {
+    it('closing underlying socket closes streams (tcp)', (done) => {
       expect(2).checks(done)
 
       const tcp = new Tcp()
-      const tcpListener = tcp.createListener((socket) => {
-        const listener = muxer.listener(socket)
+      const tcpListener = tcp.createListener((conn) => {
+        const listener = muxer.listener(conn)
         listener.on('stream', (stream) => {
           pull(stream, stream)
         })
       })
 
       tcpListener.listen(mh, () => {
-        const dialer = muxer.dialer(tcp.dial(mh, () => {
-          tcpListener.close()
-        }))
+        const dialerConn = tcp.dial(mh, tcpListener.close)
 
-        const s1 = dialer.newStream(() => {
+        const dialerMuxer = muxer.dialer(dialerConn)
+        const s1 = dialerMuxer.newStream(() => {
           pull(
             s1,
             pull.onEnd((err) => {
               expect(err).to.exist.mark()
             })
           )
+        })
 
-          const s2 = dialer.newStream(() => {
-            pull(
-              s2,
-              pull.onEnd((err) => {
-                expect(err).to.exist.mark()
-              })
-            )
-          })
+        const s2 = dialerMuxer.newStream(() => {
+          pull(
+            s2,
+            pull.onEnd((err) => {
+              expect(err).to.exist.mark()
+            })
+          )
         })
       })
     })
@@ -91,8 +88,10 @@ module.exports = (common) => {
       }
 
       conns.forEach((conn, i) => {
-        if (i === 2) {
-          closeAndWait(conn)
+        if (i === 1) {
+          closeAndWait(conn, (err) => {
+            expect(err).to.not.exist.mark()
+          })
         } else {
           pull(
             conn,