From c6c0a397c36c2d6fe2b791771d2992b87fc0abb5 Mon Sep 17 00:00:00 2001
From: Andre Staltz <andre@staltz.com>
Date: Fri, 29 Dec 2023 13:05:41 +0200
Subject: [PATCH] update to secret-stack 8.0

---
 package.json |  4 ++--
 test/util.js | 53 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index aa8baa5..3dc9fb8 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
     "prettier": "^2.6.2",
     "pretty-quick": "^3.1.3",
     "rimraf": "^4.4.0",
-    "secret-handshake-ext": "~0.0.9",
-    "secret-stack": "~7.1.1",
+    "secret-handshake-ext": "~0.0.11",
+    "secret-stack": "~8.0.0",
     "ssb-box": "^1.0.1"
   },
   "scripts": {
diff --git a/test/util.js b/test/util.js
index 38bf27f..cd7da2d 100644
--- a/test/util.js
+++ b/test/util.js
@@ -1,26 +1,34 @@
-const os = require('node:os')
-const path = require('node:path')
+const OS = require('node:os')
+const Path = require('node:path')
 const rimraf = require('rimraf')
 const caps = require('ppppp-caps')
 const Keypair = require('ppppp-keypair')
 
-function createPeer(opts) {
-  if (opts.name) {
-    const tmp = os.tmpdir()
-    const now = Date.now()
-    opts.db ??= {path: path.join(tmp, `ppppp-conductor-${opts.name}-${now}`)}
-    opts.keypair ??= Keypair.generate('ed25519', opts.name)
-    opts.name = undefined
+function createPeer(config) {
+  if (config.name) {
+    const name = config.name
+    const tmp = OS.tmpdir()
+    config.global ??= {}
+    config.global.path ??= Path.join(tmp, `ppppp-conduct-${name}-${Date.now()}`)
+    config.global.keypair ??= Keypair.generate('ed25519', name)
+    delete config.name
+  }
+  if (!config.global) {
+    throw new Error('need config.global in createPeer()')
+  }
+  if (!config.global.path) {
+    throw new Error('need config.global.path in createPeer()')
+  }
+  if (!config.global.keypair) {
+    throw new Error('need config.global.keypair in createPeer()')
   }
-  if (!opts.db.path) throw new Error('need opts.db.path in createPeer()')
-  if (!opts.keypair) throw new Error('need opts.keypair in createPeer()')
 
-  rimraf.sync(opts.db.path)
+  rimraf.sync(config.global.path)
   return require('secret-stack/bare')()
     .use(require('secret-stack/plugins/net'))
     .use(require('secret-handshake-ext/secret-stack'))
-    .use(require('ppppp-db'))
     .use(require('ssb-box'))
+    .use(require('ppppp-db'))
     .use(require('ppppp-set'))
     .use(require('ppppp-dict'))
     .use(require('ppppp-goals'))
@@ -28,16 +36,19 @@ function createPeer(opts) {
     .use(require('ppppp-gc'))
     .use(require('../lib'))
     .call(null, {
-      caps,
-      connections: {
-        incoming: {
-          net: [{ scope: 'device', transform: 'shse', port: null }],
-        },
-        outgoing: {
-          net: [{ transform: 'shse' }],
+      shse: { caps },
+      ...config,
+      global: {
+        connections: {
+          incoming: {
+            net: [{ scope: 'device', transform: 'shse', port: null }],
+          },
+          outgoing: {
+            net: [{ transform: 'shse' }],
+          },
         },
+        ...config.global,
       },
-      ...opts,
     })
 }