From 3512f95b7d9cdc5ff7156cc9ff3b0a454ea143bb Mon Sep 17 00:00:00 2001
From: "Franz Heinzmann (Frando)" <frando@unbiskant.org>
Date: Fri, 28 Oct 2022 11:13:26 +0200
Subject: [PATCH 1/4] Update Sonar to Hypercore v10 and Hyperswarm v4

---
 packages/core/lib/collection.js               |  71 ++--
 packages/core/lib/version-cache.js            |   6 +-
 packages/core/lib/workspace-manager.js        |   5 +-
 packages/core/lib/workspace.js                |  45 +-
 packages/core/package.json                    |  20 +-
 packages/core/test/basic.js                   |   3 +-
 packages/core/test/lib/create.js              |  80 +---
 .../core/test/lib/hyper-sdk/hyperspace.js     |  37 --
 packages/core/test/lib/hyper-sdk/mixed.js     |  23 -
 packages/core/test/lib/hyper-sdk/native.js    |  60 ---
 packages/core/test/new.js                     | 400 ++++++++----------
 packages/core/test/replicate.js               |   9 +-
 12 files changed, 292 insertions(+), 467 deletions(-)
 delete mode 100644 packages/core/test/lib/hyper-sdk/hyperspace.js
 delete mode 100644 packages/core/test/lib/hyper-sdk/mixed.js
 delete mode 100644 packages/core/test/lib/hyper-sdk/native.js

diff --git a/packages/core/lib/collection.js b/packages/core/lib/collection.js
index 67fbfd27..50dd0dbc 100644
--- a/packages/core/lib/collection.js
+++ b/packages/core/lib/collection.js
@@ -49,7 +49,7 @@ class PeerMap extends EventEmitter {
       const feeds = []
       for (const feed of peer.feeds) {
         feeds.push({
-          key: feed.feed.key.toString('hex'),
+          key: feed.key.toString('hex'),
           stats: feed.stats
         })
       }
@@ -58,29 +58,26 @@ class PeerMap extends EventEmitter {
     return list
   }
 
-  add (peer) {
-    const remotePublicKey = peer.stream.stream.remotePublicKey.toString('hex')
+  add (peer, feed) {
+    const remotePublicKey = peer.remotePublicKey.toString('hex')
+    this.log.debug('add peer', feed.key.toString('hex').slice(0, 8), remotePublicKey.slice(0, 9))
     const info = {
-      remotePublicKey,
-      remoteAddress: peer.stream.stream.remoteAddress
+      remotePublicKey
     }
     if (!this.peers.has(remotePublicKey)) {
-      const feeds = [peer]
+      const feeds = new Set()
       this.peers.set(remotePublicKey, { info, feeds })
       this.emit('add', info)
-    } else {
-      const existing = this.peers.get(remotePublicKey)
-      existing.feeds = existing.feeds.filter(info => info.feed.key.toString('hex') !== peer.feed.key.toString('hex'))
-      existing.feeds.push(peer)
     }
+    this.peers.get(remotePublicKey).feeds.add(feed)
   }
 
-  remove (peer) {
-    const remotePublicKey = peer.stream.stream.remotePublicKey
+  remove (peer, feed) {
+    const remotePublicKey = peer.remotePublicKey
     if (!this.peers.has(remotePublicKey)) return
     const existing = this.peers.get(remotePublicKey)
-    existing.feeds = peer.feeds.filter(info => info.feed.key.toString('hex') !== peer.feed.key.toString('hex'))
-    if (!existing.feeds.length) {
+    existing.feeds.delete(feed)
+    if (!existing.feeds.size) {
       this.peers.delete(remotePublicKey)
       this.emit('remove', existing.info)
     }
@@ -310,14 +307,14 @@ class Collection extends Nanoresource {
   }
 
   async configure (configuration = {}, save = true) {
-    let promise
+    let discovery
     if (configuration.share !== false) {
-      promise = this._workspace.network.configure(this.discoveryKey, {
+      discovery = this._workspace.sdk.join(this.discoveryKey, {
         announce: true,
         lookup: true
       })
     } else {
-      promise = this._workspace.network.configure(this.discoveryKey, {
+      discovery = this._workspace.sdk.leave(this.discoveryKey, {
         announce: false,
         lookup: false
       })
@@ -575,6 +572,8 @@ class Collection extends Nanoresource {
     }
     const self = this
     cb = maybeCallback(cb)
+    // setTimeout(cb, 100)
+    // return cb.promise
 
     // const timeout = setTimeout(() => {
     //   cb(new Error('Sync timeout')
@@ -599,7 +598,6 @@ class Collection extends Nanoresource {
 
     function syncKappa () {
       self._kappa.ready(views, () => {
-        // clearTimeout(timeout)
         cb()
       })
     }
@@ -635,6 +633,7 @@ class Collection extends Nanoresource {
   status (cb) {
     const feeds = this.feeds().map(feed => feedStatus(this, feed))
     const kappa = this._kappa.getState()
+    // TODO v10: Port.
     const network = this._workspace.network.status(this.discoveryKey)
     const config = this.getConfig() || DEFAULT_CONFIG
     const status = {
@@ -648,7 +647,7 @@ class Collection extends Nanoresource {
       length: this.length,
       feeds,
       kappa,
-      network,
+      // network,
       config,
       peers: this._peers.list()
     }
@@ -888,9 +887,7 @@ class Collection extends Nanoresource {
     })
     // wait a tick
     await new Promise(resolve => process.nextTick(resolve))
-    await new Promise(resolve => {
-      this._indexer.close(resolve)
-    })
+    await this._indexer.close()
     this.emit('close')
     this._eventStream.destroy()
   }
@@ -898,7 +895,7 @@ class Collection extends Nanoresource {
   async _initFeed (keyOrName, info = {}, opts = {}) {
     // Open the feed if it's not yet opened
     // if (this._feeds.has(keyOrName)) return this._feeds.get(keyOrName)
-    const feed = this._workspace.Hypercore(keyOrName)
+    const feed = await this._workspace.Hypercore(keyOrName)
     if (!feed.opened) await feed.ready()
     const hkey = feed.key.toString('hex')
     // Recheck if feed is opened (if it was opened by name first)
@@ -915,12 +912,16 @@ class Collection extends Nanoresource {
     feed.on('remote-update', () => {
       this.emit('remote-update', feed)
     })
+    feed.on('peer-add', peer => {
+      // console.log('peer-open', keyOrName, peer)
+      this._peers.add(peer, feed)
+    })
     feed.on('peer-open', peer => {
       // console.log('peer-open', keyOrName, peer)
-      this._peers.add(peer)
+      this._peers.add(peer, feed)
     })
     feed.on('peer-remove', peer => {
-      this._peers.remove(peer)
+      this._peers.remove(peer, feed)
     })
 
     // If the feed is unknown add it to the local feed store.
@@ -956,13 +957,16 @@ class Collection extends Nanoresource {
 
     // Look for the feed in the swarm if added by myself
     if (!opts.origin || opts.origin === this.localKey.toString('hex')) {
-      const _networkPromise = this._workspace.network.configure(
-        feed.discoveryKey,
-        {
-          announce: true,
-          lookup: true
-        }
-      )
+      if (!this._workspace.closing) {
+        await this._workspace.sdk.join(feed.discoveryKey).flushed()
+      }
+      // const _networkPromise = this._workspace.network.configure(
+      //   feed.discoveryKey,
+      //   {
+      //     announce: true,
+      //     lookup: true
+      //   }
+      // )
     }
 
     this.emit('feed', feed, info)
@@ -1341,7 +1345,8 @@ function feedStatus (collection, feed) {
     type: info.type
   }
   if (feed.opened) {
-    status.downloadedVersions = feed.downloaded(0, feed.length)
+    // TODO: Port to v10
+    // status.downloadedVersions = feed.downloaded(0, feed.length)
     status.stats = feed.stats
   }
   return status
diff --git a/packages/core/lib/version-cache.js b/packages/core/lib/version-cache.js
index 1ffc6148..ce9456de 100644
--- a/packages/core/lib/version-cache.js
+++ b/packages/core/lib/version-cache.js
@@ -37,11 +37,7 @@ module.exports = class VersionCache {
 
   async _getVersion (id, key, seq, getOpts = {}) {
     const feed = this.corestore.get({ key })
-    const rawVersion = await new Promise((resolve, reject) => {
-      feed.get(seq, getOpts, (err, version) =>
-        err ? reject(err) : resolve(version)
-      )
-    })
+    const rawVersion = await feed.get(seq, getOpts)
     const mappedVersion = this.map(rawVersion, {
       key: key.toString('hex'),
       seq
diff --git a/packages/core/lib/workspace-manager.js b/packages/core/lib/workspace-manager.js
index 2cf54040..d5facc3d 100644
--- a/packages/core/lib/workspace-manager.js
+++ b/packages/core/lib/workspace-manager.js
@@ -3,7 +3,8 @@ const {
 } = require('nanoresource-promise/emitter')
 const { promisify } = require('util')
 const mkdirp = promisify(require('mkdirp-classic'))
-const DatSDK = require('hyper-sdk')
+const createSDK = require('./sdk')
+// const DatSDK = require('hyper-sdk')
 const p = require('path')
 const RAF = require('random-access-file')
 const RAM = require('random-access-memory')
@@ -62,7 +63,7 @@ module.exports = class WorkspaceManager extends Nanoresource {
       } else {
         sdkOpts.storage = file => RAF(this.storagePath('cores/' + file))
       }
-      this.sdk = await DatSDK(sdkOpts)
+      this.sdk = await createSDK(sdkOpts)
       this.ownSDK = true
     } else {
       this.sdk = this.opts.sdk
diff --git a/packages/core/lib/workspace.js b/packages/core/lib/workspace.js
index c7a78eda..1118714a 100644
--- a/packages/core/lib/workspace.js
+++ b/packages/core/lib/workspace.js
@@ -1,4 +1,4 @@
-const DatSDK = require('hyper-sdk')
+// const DatSDK = require('hyper-sdk')
 // TODO: Think about using the hyperspace daemon :-)
 // const DatSDK = require('hyper-sdk/hyperspace')
 const RAF = require('random-access-file')
@@ -17,6 +17,7 @@ const {
 const { createLogger } = require('@arsonar/common')
 
 const Collection = require('./collection')
+const createSDK = require('./sdk')
 const LevelMap = require('./utils/level-map')
 const {
   defaultStoragePath,
@@ -58,11 +59,19 @@ module.exports = class Workspace extends Nanoresource {
   }
 
   get corestore () {
-    return this._sdk._corestore
+    return this._sdk.corestore
   }
 
   get network () {
-    return this._sdk._swarm
+    return this._sdk.swarm
+  }
+
+  get swarm () {
+    return this._sdk.swarm
+  }
+
+  get sdk () {
+    return this._sdk
   }
 
   get persist () {
@@ -84,9 +93,9 @@ module.exports = class Workspace extends Nanoresource {
       if (this._opts.persist === false) {
         sdkOpts.storage = RAM
       } else {
-        sdkOpts.storage = file => RAF(this.storagePath('cores/' + file))
+        sdkOpts.storage = file => new RAF(this.storagePath('cores/' + file))
       }
-      this._sdk = await DatSDK(sdkOpts)
+      this._sdk = await createSDK(sdkOpts)
       this._ownSDK = true
     } else {
       this._sdk = this._opts.sdk
@@ -129,23 +138,33 @@ module.exports = class Workspace extends Nanoresource {
   }
 
   async _close () {
+    this._closing = true
     if (!this.opened) await this.open()
     await new Promise(resolve => process.nextTick(resolve))
     const promises = this.collections().map(c => c.close())
     await Promise.all(promises)
     await this._workspaceInfo.close()
     await this._collectionInfo.close()
+    if (this._ownSDK) {
+      await this._sdk.swarm.destroy()
+      await this._sdk.corestore.close()
+    }
     try {
       await this._leveldb.close()
     } catch (err) {}
-    if (this._ownSDK) {
-      await this._sdk.close()
-    }
+    // if (this._ownSDK) {
+      // await this._sdk.close()
+    // }
     this._sdk = null
     // this._sdk = null
     // this._leveldb = null
     // this._collections = new Map()
     this.emit('close')
+    this._closed = true
+  }
+
+  get closing () {
+    return this._closing || this._closed
   }
 
   async status () {
@@ -200,7 +219,7 @@ module.exports = class Workspace extends Nanoresource {
   }
 
   async _nameToKey (keyOrName) {
-    const core = this.Hypercore(keyOrName)
+    const core = await this.Hypercore(keyOrName)
     await core.ready()
     return core.key
   }
@@ -322,15 +341,17 @@ module.exports = class Workspace extends Nanoresource {
     return subdb
   }
 
-  Hypercore (keyOrName, opts = {}) {
+  async Hypercore (keyOrName, opts = {}) {
+    if (this.closing) throw new Error('Workspace is closed or closing.')
     if (opts.announce === undefined) {
       opts.announce = false
     }
     if (opts.lookup === undefined) {
       opts.lookup = false
     }
-    const core = this._sdk.Hypercore(keyOrName, opts)
-    core.setMaxListeners(128)
+    await this.ready()
+    const core = await this._sdk.get(keyOrName, opts)
+    // core.setMaxListeners(128)
     return core
   }
 
diff --git a/packages/core/package.json b/packages/core/package.json
index 2d3156dc..fb0708d2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -20,7 +20,7 @@
     "@arsonar/common": "^0.6.9",
     "@arsonar/plugin-relations": "^0.6.11",
     "@arsonar/plugin-search": "^0.6.11",
-    "@frando/kappa-core": "^6.0.0",
+    "@frando/kappa-core": "https://github.com/Frando/kappa-core#v10",
     "@frando/level-live": "^1.1.0",
     "base32": "^0.0.6",
     "charwise": "^3.0.1",
@@ -28,12 +28,12 @@
     "dat-encoding": "^5.0.1",
     "debug": "^4.1.1",
     "fast-bitfield": "^1.2.2",
-    "hyper-sdk": "^3.0.9",
-    "hyperblobs": "^1.1.2",
-    "hypercore-crypto": "^2.1.1",
+    "hyper-sdk": "https://github.com/RangerMauve/hyper-sdk.git#hypercore10",
+    "hyperblobs": "^2",
+    "hypercore-crypto": "^3.2",
     "inspect-custom-symbol": "^1.1.1",
     "js-yaml": "^3.14.0",
-    "kappa-sparse-indexer": "^0.7.4",
+    "kappa-sparse-indexer": "https://github.com/Frando/kappa-sparse-indexer#849b69a",
     "level": "^6.0.1",
     "level-mem": "^5.0.1",
     "lru-cache": "^6.0.0",
@@ -46,8 +46,8 @@
     "pretty-hash": "^1.0.1",
     "protocol-buffers-encodings": "^1.1.1",
     "pump": "^3.0.0",
-    "random-access-file": "^2.1.4",
-    "random-access-memory": "^3.1.1",
+    "random-access-file": "^4.0.0",
+    "random-access-memory": "^6",
     "randombytes": "^2.1.0",
     "range-parser": "^1.2.1",
     "rimraf": "^3.0.2",
@@ -60,8 +60,10 @@
     "unordered-materialized-kv": "^1.3.0"
   },
   "devDependencies": {
-    "@hyperswarm/dht": "^4.0.1",
-    "hyperspace": "^3.15.0",
+    "@hyperswarm/dht": "^6",
+    "@hyperswarm/testnet": "^3.1.0",
+    "brittle": "^3.1.1",
+    "nonsynchronous": "^1.2.0",
     "tape": "^5.0",
     "temporary-directory": "^1.0.2",
     "webnet": "^1.0.0",
diff --git a/packages/core/test/basic.js b/packages/core/test/basic.js
index 5b0e22b1..0a894135 100644
--- a/packages/core/test/basic.js
+++ b/packages/core/test/basic.js
@@ -58,7 +58,8 @@ tape('batch and query', async t => {
   await cleanup()
 })
 
-tape('share and unshare workspace', async t => {
+// TODO v10: Port swarm status
+tape.skip('share and unshare workspace', async t => {
   const { cleanup, workspace } = await createOne()
   const collection = await workspace.createCollection('default')
   const config = await collection.getConfig()
diff --git a/packages/core/test/lib/create.js b/packages/core/test/lib/create.js
index ccfd2487..66e69962 100644
--- a/packages/core/test/lib/create.js
+++ b/packages/core/test/lib/create.js
@@ -1,11 +1,14 @@
-const tmp = require('temporary-directory')
 const tmpPromise = require('tmp-promise')
-const { Workspace, LegacyWorkspace } = require('../..')
+const createTestnet = require('@hyperswarm/testnet')
+const createSDK = require('../../lib/sdk')
+const { Workspace } = require('../..')
 
-module.exports = Object.assign(createStore, {
+module.exports = {
   createOne,
-  createMany
-})
+  createMany,
+  createSDK,
+  createDHT
+}
 
 async function createOne (opts = {}) {
   let cleanupStorage
@@ -48,7 +51,7 @@ async function createMany (n, opts = {}) {
     workspaces.push(workspace)
     cleanups.push(cleanup)
   }
-  return { workspaces, cleanup }
+  return { workspaces, cleanup, bootstrap }
 
   async function cleanup () {
     await abortAfter(1000, 'Cleanup timeout', async () => {
@@ -76,66 +79,11 @@ async function abortAfter (ms, message, fn) {
 }
 
 async function createDHT () {
-  const bootstrapper = require('@hyperswarm/dht')({
-    bootstrap: false
-  })
-  bootstrapper.listen()
-  await new Promise(resolve => {
-    return bootstrapper.once('listening', resolve)
-  })
-  const bootstrapPort = bootstrapper.address().port
-  const bootstrapOpt = [`localhost:${bootstrapPort}}`]
-  return { bootstrap: bootstrapOpt, cleanup }
-
-  async function cleanup () {
-    await bootstrapper.destroy()
-  }
-}
-
-// TODO: Remove.
-function createStore (opts, cb) {
-  if (typeof opts === 'function') {
-    cb = opts
-    opts = {}
-  }
-  cb = maybepify(cb)
-  opts.swarmOpts = { bootstrap: false }
-  tmp('sonar-test', ondircreated)
-  function ondircreated (err, dir, cleanupTempdir) {
-    if (err) return cb(err)
-    const collections = new LegacyWorkspace(dir, opts)
-    collections.ready(err => {
-      if (err) return cb(err)
-      cb(null, collections, cleanup)
-    })
-    function cleanup (cb) {
-      cb = maybepify(cb)
-      collections.close(() => {
-        cleanupTempdir(err => {
-          cb(err)
-        })
-      })
-      return cb.promise
+  const testnet = await createTestnet(2)
+  return {
+    bootstrap: testnet.bootstrap,
+    async cleanup () {
+      await testnet.destroy()
     }
   }
-  return cb.promise
-}
-
-function maybepify (cb) {
-  if (!cb) {
-    let pargs
-    const callback = (err, ...res) => {
-      if (err) return pargs.reject(err)
-      if (res.length === 1) pargs.resolve(res[0])
-      else pargs.resolve(res)
-    }
-    const promise = new Promise((resolve, reject) => {
-      pargs = { resolve, reject }
-    })
-    callback.promise = promise
-    return callback
-  } else {
-    cb.promise = undefined
-    return cb
-  }
 }
diff --git a/packages/core/test/lib/hyper-sdk/hyperspace.js b/packages/core/test/lib/hyper-sdk/hyperspace.js
deleted file mode 100644
index 043f410f..00000000
--- a/packages/core/test/lib/hyper-sdk/hyperspace.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const SDK = require('hyper-sdk/hyperspace')
-const { isBrowser } = require('./env')
-
-const HYPERSPACE_TEST_PORT = 9000
-
-module.exports = async function createHyperspace (n) {
-  const cleanups = []
-  const sdks = []
-  if (!isBrowser) {
-    const { createMany } = require('hyperspace/test/helpers/create')
-    const { clients, cleanup: cleanupHyperspace } = await createMany(n)
-    cleanups.push(cleanupHyperspace)
-    for (const client of clients) {
-      const sdk = await SDK({
-        hyperspaceOpts: { client }
-      })
-      sdks.push(sdk)
-    }
-  } else {
-    let port = HYPERSPACE_TEST_PORT
-    while (port < HYPERSPACE_TEST_PORT + n) {
-      const sdk = await SDK({
-        hyperspaceOpts: { port }
-      })
-      sdks.push(sdk)
-      port++
-    }
-  }
-
-  return { sdks, cleanup }
-
-  async function cleanup () {
-    console.log('# [test/hyperspace] cleanup start')
-    await Promise.all(cleanups.map(cleanup => cleanup()))
-    console.log('# [test/hyperspace] cleanup end')
-  }
-}
diff --git a/packages/core/test/lib/hyper-sdk/mixed.js b/packages/core/test/lib/hyper-sdk/mixed.js
deleted file mode 100644
index 606d1c72..00000000
--- a/packages/core/test/lib/hyper-sdk/mixed.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const createNative = require('./native')
-const createHyperspace = require('./hyperspace')
-
-module.exports = async function createMixed (n) {
-  const nNative = Math.ceil(n / 2)
-  const nHyperspace = n - nNative
-  const native = await createNative(nNative)
-  const hyperspace = await createHyperspace(nHyperspace)
-  const sdks = []
-  for (let i = 0; i < n; i++) {
-    sdks.push(i % 2 === 0 ? native.sdks.shift() : hyperspace.sdks.shift())
-  }
-  return { sdks, cleanup }
-
-  async function cleanup () {
-    console.log('# [test/mixed] cleanup start (cleans up native and hyperspace)')
-    await Promise.all([
-      hyperspace.cleanup(),
-      native.cleanup()
-    ])
-    console.log('# [test/mixed] cleanup end')
-  }
-}
diff --git a/packages/core/test/lib/hyper-sdk/native.js b/packages/core/test/lib/hyper-sdk/native.js
deleted file mode 100644
index ddfa4a8e..00000000
--- a/packages/core/test/lib/hyper-sdk/native.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const SDK = require('hyper-sdk')
-const RAA = require('random-access-application')
-const { isBrowser } = require('./env')
-
-module.exports = async function createNative (n) {
-  let swarmOpts, localDht
-  if (!isBrowser) {
-    localDht = await createDHT()
-    swarmOpts = { bootstrap: localDht.bootstrap }
-  }
-  const sdks = []
-  while (--n >= 0) {
-    const sdk = await SDK({
-      storage: await getNewStorage(),
-      swarmOpts
-    })
-    sdks.push(sdk)
-  }
-
-  return { sdks, cleanup }
-
-  function cleanup () {
-    console.log('# [test/native] cleanup start')
-    if (localDht) localDht.cleanup()
-    console.log('# [test/native] cleanup end')
-  }
-}
-
-async function getNewStorage () {
-  if (isBrowser) {
-    // Get a random number, use it for random-access-application
-    const name = Math.random().toString()
-    return RAA(name)
-  } else {
-    const tmp = require('tmp-promise')
-    const dir = await tmp.dir({
-      prefix: 'dat-sdk-tests-'
-    })
-    return dir.path
-  }
-}
-
-async function createDHT () {
-  const bootstrapper = require('@hyperswarm/dht')({
-    bootstrap: false
-  })
-  const closed = new Promise(resolve => bootstrapper.once('closed', resolve))
-  bootstrapper.listen()
-  await new Promise(resolve => {
-    return bootstrapper.once('listening', resolve)
-  })
-  const bootstrapPort = bootstrapper.address().port
-  const bootstrapOpt = [`localhost:${bootstrapPort}}`]
-  return { bootstrap: bootstrapOpt, cleanup }
-
-  async function cleanup () {
-    bootstrapper.destroy()
-    await closed
-  }
-}
diff --git a/packages/core/test/new.js b/packages/core/test/new.js
index a01bbe40..85a2758a 100644
--- a/packages/core/test/new.js
+++ b/packages/core/test/new.js
@@ -1,76 +1,11 @@
 const test = require('tape')
-const { promisify } = require('util')
-const tempdir = promisify(require('temporary-directory'))
-const rimraf = promisify(require('rimraf'))
-// const why = require('why-is-node-running')
-
-const createNative = require('./lib/hyper-sdk/native')
-const createHyperspace = require('./lib/hyper-sdk/hyperspace')
-const createMixed = require('./lib/hyper-sdk/mixed')
-
+const { createMany, createOne } = require('./lib/create')
 const { Workspace } = require('..')
 
 // Prepare and patch tape
 Error.stackTraceLimit = 50
 applyStacktrace()
 
-// Run tests
-runAll()
-
-function runAll () {
-  run(createNative, 'native')
-  const only = !!test.getHarness()._results._only
-  if (!only) {
-    run(createHyperspace, 'hyperspace')
-    run(createMixed, 'mixed')
-  }
-}
-
-function run (createSDK, label) {
-  applyLabel()
-  runTests(createN.bind(null, createSDK))
-  applyLabel(label)
-}
-
-async function createN (createSDK, n, opts = {}) {
-  if (n > 2) throw new Error('Only two SDKs supported')
-  const { sdks, cleanup: cleanupSDK } = await createSDK(n)
-
-  const dirs = []
-  const workspaces = []
-
-  for (const sdk of sdks) {
-    const dir = await tempdir('sonar-test')
-    const workspace = new Workspace({
-      storagePath: dir,
-      sdk,
-      persist: opts.persist || false
-      // swarmOpts: {
-      //   bootstrap: false
-      // }
-    })
-    dirs.push(dir)
-    workspaces.push(workspace)
-  }
-  await Promise.all(workspaces.map(workspace => workspace.ready()))
-
-  return [...workspaces, cleanup]
-
-  async function cleanup () {
-    try {
-      await Promise.all(workspaces.map(workspace => workspace.close()))
-      await new Promise(resolve => setTimeout(resolve, 200))
-      await Promise.all(sdks.map(sdk => sdk.close()))
-      await new Promise(resolve => setTimeout(resolve, 200))
-      cleanupSDK()
-      await Promise.all(dirs.map(dir => rimraf(dir)))
-      await new Promise(resolve => setTimeout(resolve, 200))
-    } catch (err) {
-      console.error('Closing error', err)
-    }
-  }
-}
-
 const DOC_SPEC = {
   name: 'doc',
   fields: {
@@ -87,158 +22,187 @@ async function setup (collection) {
   })
 }
 
-function runTests (create) {
-  test('basic put and get', async t => {
-    // try {
-    const [w1, cleanup] = await create(1)
-    const c1 = await w1.createCollection('default')
-    await setup(c1)
-    const res = await c1.query('records', { type: 'doc' })
-    t.equal(res.length, 1)
-    const record = res[0]
-    t.equal(record.get('title'), 'hello')
-    t.equal(record.key, c1.key.toString('hex'))
-
-    const sameRecord = await c1.getRecord({
-      key: record.key,
-      seq: record.seq
+test.skip('replication smoke test', async t => {
+  const createTestnet = require('@hyperswarm/testnet')
+  const Hyperswarm = require('hyperswarm')
+  const noop = () => {}
+
+  const { bootstrap } = await createTestnet(3, t.teardown)
+  console.log('bs', bootstrap)
+
+  const swarm1 = new Hyperswarm({ bootstrap })
+  const swarm2 = new Hyperswarm({ bootstrap })
+  const connected = new Promise(resolve => {
+    swarm1.on('connection', (conn, peerInfo) => {
+      conn.on('error', noop)
+      conn.end()
+      // console.log('incoming on 1', peerInfo)
+      setTimeout(resolve, 100)
+    })
+    swarm2.on('connection', (conn, peerInfo) => {
+      conn.on('error', noop)
+      conn.end()
+      // console.log('incoming on 2', peerInfo)
     })
-    // TODO: deepEqual fails for equal records, find out why and fix.
-    t.deepEqual(record._record, sameRecord._record)
-    await cleanup()
-    // }catch(err){console.error(err)}
   })
 
-  test('basic replication', { timeout: 5000 }, async t => {
-    const [w1, w2, cleanup] = await create(2)
-
-    const c1 = await w1.createCollection('default')
-    await setup(c1)
-
-    let res = await c1.query('records', { type: 'doc' })
-    t.equal(res.length, 1, 'c1 len ok')
-    let record = res[0]
-    t.equal(record && record.get('title'), 'hello', 'c2 val ok')
-
-    const c2 = await w2.createCollection(c1.key)
-    await c2.open()
-    await c2.sync()
-
-    res = await c2.query('records', { type: 'doc' })
-    t.equal(res.length, 1, 'c2 len ok')
-    record = res[0]
-    t.equal(record && record.get('title'), 'hello', 'c2 val ok')
-
-    const updatedRecord = record.update({ title: 'hi' })
-    await c2.put(updatedRecord)
-    await c2.sync()
-    res = await c2.query('records', { type: 'doc' })
-    t.equal(res.length, 1, 'c2 len ok')
-    t.equal(res[0].get('title'), 'hi', 'c2 val updated')
+  const topic = Buffer.alloc(32).fill('hello world')
+  const disco1 = swarm1.join(topic, { server: true, client: true })
+  await disco1.flushed()
+  const disco2 = swarm2.join(topic, { server: true, client: true })
+  await disco2.flushed()
+  // console.log('1 joined', await disco1.flushed())
+  // console.log('2 joined', await disco2.flushed())
+  await connected
+  t.equal(true, true)
+  await swarm1.destroy()
+  await swarm2.destroy()
+})
+
+test('basic put and get', async t => {
+  // try {
+  const { workspace: w1, cleanup } = await createOne()
+  const c1 = await w1.createCollection('default')
+  await setup(c1)
+  const res = await c1.query('records', { type: 'doc' })
+  t.equal(res.length, 1)
+  const record = res[0]
+  t.equal(record.get('title'), 'hello')
+  t.equal(record.key, c1.key.toString('hex'))
+
+  const sameRecord = await c1.getRecord({
+    key: record.key,
+    seq: record.seq
+  })
+  // TODO: deepEqual fails for equal records, find out why and fix.
+  t.deepEqual(record._record, sameRecord._record)
+  await cleanup()
+  // }catch(err){console.error(err)}
+})
+
+test('basic replication', { timeout: 50000 }, async t => {
+  const { workspaces: [w1, w2], cleanup } = await createMany(2)
+
+  const c1 = await w1.createCollection('default')
+  await setup(c1)
+
+  let res = await c1.query('records', { type: 'doc' })
+  t.equal(res.length, 1, 'c1 len ok')
+  let record = res[0]
+  t.equal(record && record.get('title'), 'hello', 'c2 val ok')
+
+  const c2 = await w2.createCollection(c1.key)
+  await c2.open()
+  await c2.sync()
+
+  res = await c2.query('records', { type: 'doc' })
+  t.equal(res.length, 1, 'c2 len ok')
+  record = res[0]
+  t.equal(record && record.get('title'), 'hello', 'c2 val ok')
+
+  const updatedRecord = record.update({ title: 'hi' })
+  await c2.put(updatedRecord)
+  await c2.sync()
+  res = await c2.query('records', { type: 'doc' })
+  t.equal(res.length, 1, 'c2 len ok')
+  t.equal(res[0].get('title'), 'hi', 'c2 val updated')
+
+  await c1.putFeed(c2.localKey)
+  await waitForUpdate(c1, true)
+
+  res = await c1.query('records', { type: 'doc' })
+  t.equal(res.length, 1)
+  t.equal(res[0].get('title'), 'hi', 'c1 query correct')
+
+  await cleanup()
+
+  async function waitForUpdate (col) {
+    await new Promise(resolve => col.once('update', resolve))
+    await col.sync()
+  }
+})
+
+test('open and close and open', async t => {
+  let { workspace, cleanup } = await createOne({ persist: true })
+  let col = await workspace.createCollection('first')
+  await col.ready()
+  await col.putType(DOC_SPEC)
+  const type1 = col.schema.getType('doc')
+  t.equal(type1.name, 'doc')
+
+  // const sdk = workspace._sdk
+  const storagePath = workspace._storagePath
+
+  await workspace.close()
+  await timeout(200)
+
+  workspace = new Workspace({ storagePath })
+  await workspace.open()
+  col = await workspace.createCollection('first')
+  await col.ready()
+  const key = col.key
+  const type2 = col.schema.getType('doc')
+  t.equal(type2.name, 'doc')
+  t.deepEqual(type1, type2)
+  await workspace.close()
+  await timeout(200)
+
+  workspace = new Workspace({ storagePath })
+  await workspace.ready()
+  col = await workspace.openCollection(key)
+  await col.ready()
+  const type3 = col.schema.getType('doc')
+  t.equal(type3.name, 'doc')
+  t.deepEqual(type1, type2)
+  await workspace.close()
+
+  await cleanup()
+})
+
+// TODO v10: Find out why the timeouts are needed.
+test('replication with 3 workspaces', async t => {
+  const { workspaces: [w1, w2, w3], cleanup } = await createMany(3)
+  const c1 = await w1.createCollection('foo')
+  const c2 = await w2.createCollection('foo')
+  const { id } = await c1.put({
+    type: 'sonar/entity',
+    value: { label: 'foo1' }
+  })
+  await c2.putFeed(c1.localKey)
+  await c1.putFeed(c2.localKey)
 
-    await c1.putFeed(c2.localKey)
-    await waitForUpdate(c1, true)
+  await timeout(10000)
+  await c2.sync()
 
-    res = await c1.query('records', { type: 'doc' })
-    t.equal(res.length, 1)
-    t.equal(res[0].get('title'), 'hi', 'c1 query correct')
+  await c2.put({ id, type: 'sonar/entity', value: { label: 'foo1 edit' } })
 
-    await cleanup()
+  await timeout(5000)
+  await c2.sync()
+  await c1.sync()
 
-    async function waitForUpdate (col) {
-      await new Promise(resolve => col.once('update', resolve))
-      await col.sync()
-    }
-  })
+  const res1 = await c1.query('records', { type: 'sonar/entity' })
+  t.equal(res1[0].value.label, 'foo1 edit')
+  const res2 = await c2.query('records', { type: 'sonar/entity' })
+  t.equal(res2[0].value.label, 'foo1 edit')
 
-  test('open and close and open', async t => {
-    let [workspace, cleanup] = await create(1, { persist: true })
-    let col = await workspace.createCollection('first')
-    await col.ready()
-    await col.putType(DOC_SPEC)
-    const type1 = col.schema.getType('doc')
-    t.equal(type1.name, 'doc')
-
-    const sdk = workspace._sdk
-    const storagePath = workspace._storagePath
-
-    await workspace.close()
-    await timeout(200)
-
-    workspace = new Workspace({ storagePath, sdk })
-    await workspace.open()
-    col = await workspace.createCollection('first')
-    await col.ready()
-    const key = col.key
-    const type2 = col.schema.getType('doc')
-    t.equal(type2.name, 'doc')
-    t.deepEqual(type1, type2)
-    await workspace.close()
-    await timeout(200)
-
-    workspace = new Workspace({ storagePath, sdk })
-    await workspace.ready()
-    col = await workspace.openCollection(key)
-    await col.ready()
-    const type3 = col.schema.getType('doc')
-    t.equal(type3.name, 'doc')
-    t.deepEqual(type1, type2)
-    await workspace.close()
-
-    await cleanup()
-  })
+  await c1.close()
+  await w1.close()
 
-  test('replication with 3 workspaces', async t => {
-    const [w1, w2, cleanup] = await create(2)
-    const c1 = await w1.createCollection('foo')
-    const c2 = await w2.createCollection('foo')
-    const { id } = await c1.put({
-      type: 'sonar/entity',
-      value: { label: 'foo1' }
-    })
-    await c2.putFeed(c1.localKey)
-    await c1.putFeed(c2.localKey)
-    await timeout(100)
-    await c2.sync()
-    await c2.put({ id, type: 'sonar/entity', value: { label: 'foo1 edit' } })
-    await timeout(100)
-    await c2.sync()
-    await c1.sync()
-    const res1 = await c1.query('records', { type: 'sonar/entity' })
-    t.equal(res1[0].value.label, 'foo1 edit')
-    const res2 = await c2.query('records', { type: 'sonar/entity' })
-    t.equal(res2[0].value.label, 'foo1 edit')
-
-    // close first workspace
-    await c1.close()
-    await w1.close()
-    // create third workspace
-    const [w3, cleanup2] = await create(1)
-    const c3 = await w3.createCollection('foo')
-    await c3.putFeed(c2.localKey)
-    await timeout(100)
-    await c3.sync()
-    const res3 = await c3.query('records', { type: 'sonar/entity' })
-    const oldVersion = await c3.get({ address: res3[0].links[0] })
-    t.equal(oldVersion[0].value.label, 'foo1')
-    await cleanup()
-    await cleanup2()
-  })
-}
+  const c3 = await w3.createCollection('foo')
+  await c3.putFeed(c2.localKey)
+  await c3.sync()
+  await timeout(5000)
+  const res3 = await c3.query('records', { type: 'sonar/entity' })
+  const oldVersion = await c3.get({ address: res3[0].links[0] })
+  t.equal(oldVersion[0].value.label, 'foo1')
+  await cleanup()
+  // await cleanup2()
+})
 
 async function timeout (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
-function applyLabel (label) {
-  const harness = test.getHarness()
-  const lastLabel = harness._lastLabel || 0
-  harness._lastLabel = harness._tests.length
-  harness._tests.slice(lastLabel).forEach(test => {
-    if (label) test.name = label + ': ' + test.name
-  })
-}
-
 function applyStacktrace () {
   process.nextTick(() => {
     const harness = test.getHarness()
@@ -248,21 +212,21 @@ function applyStacktrace () {
       test._cb.name = origCb.name
     }
   })
+}
 
-  function handler (origCb, t, ...args) {
-    try {
-      let maybePromise = origCb(t, ...args)
-      if (maybePromise && maybePromise.then) {
-        return maybePromise.catch(async err => {
-          console.error('Original error', err)
-          throw err
-          // t.fail(err)
-          // t.end()
-        })
-      }
-    } catch (err) {
-      t.fail(err)
-      t.end()
+function handler (origCb, t, ...args) {
+  try {
+    let maybePromise = origCb(t, ...args)
+    if (maybePromise && maybePromise.then) {
+      return maybePromise.catch(async err => {
+        console.error('Original error', err)
+        throw err
+        // t.fail(err)
+        // t.end()
+      })
     }
+  } catch (err) {
+    t.fail(err)
+    t.end()
   }
 }
diff --git a/packages/core/test/replicate.js b/packages/core/test/replicate.js
index 4879d225..19cec39a 100644
--- a/packages/core/test/replicate.js
+++ b/packages/core/test/replicate.js
@@ -28,7 +28,8 @@ function doc (title, id) {
   return { type: 'doc', value: { title }, id }
 }
 
-tape('simple replication', { timeout: 5000 }, async t => {
+// TODO v10 test is very slow
+tape('simple replication', { timeout: 50000 }, async t => {
   const { workspaces, cleanup } = await createMany(2)
   const [workspace1, workspace2] = workspaces
 
@@ -64,6 +65,8 @@ tape('simple replication', { timeout: 5000 }, async t => {
   )
   const collection2localkey = collection2.localKey
   await collection.putFeed(collection2localkey, { alias: 'w2' })
+  // TODO v10: Remove timeout
+  await timeout(5000)
   await collection.sync()
   await collection2.put(doc('2rev1', id))
   // await waitForUpdate(collection)
@@ -101,3 +104,7 @@ async function waitForUpdate (col) {
   await new Promise(resolve => col.once('update', resolve))
   await col.update()
 }
+
+function timeout (ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

From 5172d3f7d2c9cdb126b726232b2575874dd10155 Mon Sep 17 00:00:00 2001
From: "Franz Heinzmann (Frando)" <frando@unbiskant.org>
Date: Fri, 28 Oct 2022 11:52:09 +0200
Subject: [PATCH 2/4] add missing file

---
 packages/core/lib/sdk.js | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/core/lib/sdk.js

diff --git a/packages/core/lib/sdk.js b/packages/core/lib/sdk.js
new file mode 100644
index 00000000..dd5b1902
--- /dev/null
+++ b/packages/core/lib/sdk.js
@@ -0,0 +1,6 @@
+module.exports = async function createSDK (opts = {}) {
+  opts.autoJoin = false
+  const { create } = await import('hyper-sdk')
+  const sdk = await create(opts)
+  return sdk
+}

From 01782297170f6e0adc9f3be55d1c2966cf6432f0 Mon Sep 17 00:00:00 2001
From: "Franz Heinzmann (Frando)" <frando@unbiskant.org>
Date: Fri, 28 Oct 2022 11:55:53 +0200
Subject: [PATCH 3/4] fix

---
 packages/core/lib/collection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/lib/collection.js b/packages/core/lib/collection.js
index 50dd0dbc..b4426fc3 100644
--- a/packages/core/lib/collection.js
+++ b/packages/core/lib/collection.js
@@ -60,7 +60,7 @@ class PeerMap extends EventEmitter {
 
   add (peer, feed) {
     const remotePublicKey = peer.remotePublicKey.toString('hex')
-    this.log.debug('add peer', feed.key.toString('hex').slice(0, 8), remotePublicKey.slice(0, 9))
+    // this.log.debug('add peer', feed.key.toString('hex').slice(0, 8), remotePublicKey.slice(0, 9))
     const info = {
       remotePublicKey
     }

From ae2dda2ccee1d0ac393772db206ac935a909d0f3 Mon Sep 17 00:00:00 2001
From: "Franz Heinzmann (Frando)" <frando@unbiskant.org>
Date: Fri, 28 Oct 2022 12:22:26 +0200
Subject: [PATCH 4/4] ensure swarm is created by hyper-sdk

---
 packages/core/lib/sdk.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/lib/sdk.js b/packages/core/lib/sdk.js
index dd5b1902..b91c2171 100644
--- a/packages/core/lib/sdk.js
+++ b/packages/core/lib/sdk.js
@@ -1,5 +1,6 @@
 module.exports = async function createSDK (opts = {}) {
   opts.autoJoin = false
+  delete opts.swarm
   const { create } = await import('hyper-sdk')
   const sdk = await create(opts)
   return sdk