Merge pull request #93 from ssbc/tape-5

Update tape to v5

package.json

@@ -53,7 +53,7 @@
     "ssb-replicate": "^1.3.3",
     "standard": "^17.1.0",
     "tap-arc": "^0.4.0",
-    "tape": "^4.16.2"
+    "tape": "^5.7.0"
   },
   "keywords": [
     "scuttlebutt",

test/api/add-new-author-listener.test.js

@@ -2,7 +2,7 @@ const test = require('tape')
 const { promisify: p } = require('util')
 const { Server, replicate } = require('../helpers')
 
-test('addNewAuthorListener', async t => {
+test('addNewAuthorListener', t => {
   t.plan(6)
 
   const admin = Server({ name: 'admin', debug: false }) // me
@@ -40,27 +40,24 @@ test('addNewAuthorListener', async t => {
     setTimeout(() => {
       admin.close()
       newPerson.close()
-      t.end()
     }, 1000)
   })
 
-  try {
-    const groupData = await p(admin.tribes.create)({}).catch(t.fail)
-    // this makes a group, but also in the background, alerts the newAuthorListeners
-    // so the above listener can get called *before* we have access to the groupId
+  // this makes a group, but also in the background, alerts the newAuthorListeners
+  // so the above listener can get called *before* we have access to the groupId
+  p(admin.tribes.create)({}).then((groupData) => {
     groupId = groupData.groupId
-    await p(admin.tribes.invite)(groupId, [newPerson.id], { text: 'ahoy' }).catch(err => {
-      console.error('invite failed:', err)
-      t.fail(err)
-    })
-
-    await p(admin.tribes.invite)(groupId, [newPerson.id], { text: 'ahoy again' }).catch(t.fail)
+    return p(admin.tribes.invite)(groupId, [newPerson.id], { text: 'ahoy' })
+  }).then(() => {
+    return p(admin.tribes.invite)(groupId, [newPerson.id], { text: 'ahoy again' })
+  }).then(() => {
     // we want to test that duplicate adds dont fire the addNewAuthorListener multiple times,
     // unfortunately there are race conditions around calculating the new authors, so
     // we have added a small delay here
+    // later note: no we haven't?
 
-    p(replicate)({ from: admin, to: newPerson, name })
-  } catch (err) {
+    return p(replicate)({ from: admin, to: newPerson, name })
+  }).catch((err) => {
     t.fail(err)
-  }
+  })
 })

test/lib/group-id.test.js

@@ -52,10 +52,13 @@ test('groupId', t => {
     t.equal(groupId({ groupInitMsg, groupKey }), data.groupId, 'can calculate groupId with groupKey')
 
     server.close()
+    t.end()
   })
+})
 
-  // -----------------------------------------------------------
+// -----------------------------------------------------------
 
+test('groupId vectors', t => {
   /* testing against shared test-vectors */
   vectors.forEach(vector => {
     decodeLeaves(vector)