From 1ee69de573c7052d2837ae2388ccd26309b0728c Mon Sep 17 00:00:00 2001 From: Andre Staltz Date: Sun, 25 Jun 2023 11:38:19 +0300 Subject: [PATCH] replace ssb-caps with ppppp-caps --- package.json | 6 ++---- test/add.test.js | 4 ++-- test/del.test.js | 4 ++-- test/erase.test.js | 4 ++-- test/feed-get-id.test.js | 4 ++-- test/feed-publish.test.js | 4 ++-- test/get.test.js | 4 ++-- test/getTangle.test.js | 4 ++-- test/identity-add.test.js | 8 ++++---- test/identity-create.test.js | 6 +++--- test/msgs-iterator.test.js | 4 ++-- test/on-record-added.test.js | 4 ++-- test/re-open.test.js | 6 +++--- test/records-iterator.test.js | 4 ++-- 14 files changed, 32 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index 6dc2a2c..9c26c22 100644 --- a/package.json +++ b/package.json @@ -41,14 +41,12 @@ "@types/b4a": "^1.6.0", "c8": "^7.11.0", "husky": "^4.3.0", + "ppppp-caps": "github:staltz/ppppp-caps", "prettier": "^2.6.2", "pretty-quick": "^3.1.3", "rimraf": "^4.4.0", "secret-stack": "^6.4.2", - "ssb-bendy-butt": "^1.0.0", - "ssb-box": "^1.0.1", - "ssb-caps": "^1.1.0", - "ssb-classic": "^1.1.0" + "ssb-box": "^1.0.1" }, "scripts": { "test": "node --test", diff --git a/test/add.test.js b/test/add.test.js index 9d8d3e5..1c1de50 100644 --- a/test/add.test.js +++ b/test/add.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const MsgV3 = require('../lib/msg-v3') @@ -14,7 +14,7 @@ rimraf.sync(DIR) test('add()', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) diff --git a/test/del.test.js b/test/del.test.js index b9fcc04..130e91e 100644 --- a/test/del.test.js +++ b/test/del.test.js @@ -7,7 +7,7 @@ const rimraf = require('rimraf') const SecretStack = require('secret-stack') const AAOL = require('async-append-only-log') const push = require('push-stream') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-del') @@ -15,7 +15,7 @@ rimraf.sync(DIR) test('del', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .call(null, { keypair, path: DIR }) diff --git a/test/erase.test.js b/test/erase.test.js index 90eef43..b23c8cd 100644 --- a/test/erase.test.js +++ b/test/erase.test.js @@ -7,7 +7,7 @@ const rimraf = require('rimraf') const SecretStack = require('secret-stack') const AAOL = require('async-append-only-log') const push = require('push-stream') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-erase') @@ -15,7 +15,7 @@ rimraf.sync(DIR) test('erase', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .call(null, { keypair, path: DIR }) diff --git a/test/feed-get-id.test.js b/test/feed-get-id.test.js index 0c0f95e..e6dd8b5 100644 --- a/test/feed-get-id.test.js +++ b/test/feed-get-id.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const MsgV3 = require('../lib/msg-v3') @@ -18,7 +18,7 @@ let id let rootMsg let rootHash test('setup', async (t) => { - peer = SecretStack({ appKey: caps.shs }) + peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) diff --git a/test/feed-publish.test.js b/test/feed-publish.test.js index 1faac04..b82f85d 100644 --- a/test/feed-publish.test.js +++ b/test/feed-publish.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const MsgV3 = require('../lib/msg-v3') @@ -19,7 +19,7 @@ let id let rootMsg let rootHash test('setup', async (t) => { - peer = SecretStack({ appKey: caps.shs }) + peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) diff --git a/test/get.test.js b/test/get.test.js index df5c968..03bbad6 100644 --- a/test/get.test.js +++ b/test/get.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const MsgV3 = require('../lib/msg-v3') @@ -18,7 +18,7 @@ let id let msgHash1 let msgId1 test('setup', async (t) => { - peer = SecretStack({ appKey: caps.shs }) + peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) diff --git a/test/getTangle.test.js b/test/getTangle.test.js index 6e86e84..292ae20 100644 --- a/test/getTangle.test.js +++ b/test/getTangle.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-tangle') @@ -19,7 +19,7 @@ test('setup', async (t) => { const keypairB = Keypair.generate('ed25519', 'bob') const keypairC = Keypair.generate('ed25519', 'carol') - peer = SecretStack({ appKey: caps.shs }) + peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair: keypairA, path: DIR }) diff --git a/test/identity-add.test.js b/test/identity-add.test.js index bfe4b8c..20b7c41 100644 --- a/test/identity-add.test.js +++ b/test/identity-add.test.js @@ -5,7 +5,7 @@ const p = require('node:util').promisify const os = require('node:os') const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-identity-add') @@ -15,7 +15,7 @@ test('identity.add()', async (t) => { const keypair1 = Keypair.generate('ed25519', 'alice') const keypair2 = Keypair.generate('ed25519', 'bob') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair: keypair1, path: DIR }) @@ -47,7 +47,7 @@ test('publish with a key in the identity', async (t) => { const keypair1 = Keypair.generate('ed25519', 'alice') const keypair2 = Keypair.generate('ed25519', 'bob') - let peer = SecretStack({ appKey: caps.shs }) + let peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair: keypair1, path: DIR }) @@ -90,7 +90,7 @@ test('publish with a key in the identity', async (t) => { rimraf.sync(DIR) const keypair3 = Keypair.generate('ed25519', 'carol') - const carol = SecretStack({ appKey: caps.shs }) + const carol = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair: keypair3, path: DIR }) diff --git a/test/identity-create.test.js b/test/identity-create.test.js index 6fa6b33..7ecc330 100644 --- a/test/identity-create.test.js +++ b/test/identity-create.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-identity-create') @@ -13,7 +13,7 @@ rimraf.sync(DIR) test('identity.create() without args', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) @@ -35,7 +35,7 @@ test('identity.create() without args', async (t) => { test('identity.create() with "keypair" arg', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) diff --git a/test/msgs-iterator.test.js b/test/msgs-iterator.test.js index 2219d53..15c2ad3 100644 --- a/test/msgs-iterator.test.js +++ b/test/msgs-iterator.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-msgs-iter') @@ -13,7 +13,7 @@ rimraf.sync(DIR) test('msgs() iterator', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .call(null, { keypair, path: DIR }) diff --git a/test/on-record-added.test.js b/test/on-record-added.test.js index 1c7b81a..db824cf 100644 --- a/test/on-record-added.test.js +++ b/test/on-record-added.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-on-msg-added') @@ -13,7 +13,7 @@ rimraf.sync(DIR) test('onRecordAdded', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .call(null, { keypair, path: DIR }) diff --git a/test/re-open.test.js b/test/re-open.test.js index 27a8cfb..b4d79d2 100644 --- a/test/re-open.test.js +++ b/test/re-open.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-re-open') @@ -13,7 +13,7 @@ rimraf.sync(DIR) test('publish some msgs, close, re-open', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) @@ -39,7 +39,7 @@ test('publish some msgs, close, re-open', async (t) => { await p(peer.close)(true) // t.pass('closed') - const peer2 = SecretStack({ appKey: caps.shs }) + const peer2 = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .use(require('ssb-box')) .call(null, { keypair, path: DIR }) diff --git a/test/records-iterator.test.js b/test/records-iterator.test.js index ead3e40..e4affaf 100644 --- a/test/records-iterator.test.js +++ b/test/records-iterator.test.js @@ -5,7 +5,7 @@ const os = require('node:os') const p = require('node:util').promisify const rimraf = require('rimraf') const SecretStack = require('secret-stack') -const caps = require('ssb-caps') +const caps = require('ppppp-caps') const Keypair = require('ppppp-keypair') const DIR = path.join(os.tmpdir(), 'ppppp-db-records-iter') @@ -13,7 +13,7 @@ rimraf.sync(DIR) test('records() iterator', async (t) => { const keypair = Keypair.generate('ed25519', 'alice') - const peer = SecretStack({ appKey: caps.shs }) + const peer = SecretStack({ appKey: caps.shse }) .use(require('../lib')) .call(null, { keypair, path: DIR })