update tests to not directly use MsgV2 APIs

This commit is contained in:
Andre Staltz 2023-05-26 14:14:11 +03:00
parent 32c5b903b1
commit 82fead6c2d
No known key found for this signature in database
GPG Key ID: 9EDE23EA7E8A4890
2 changed files with 89 additions and 73 deletions

View File

@ -4,7 +4,6 @@ const os = require('os')
const rimraf = require('rimraf') const rimraf = require('rimraf')
const SecretStack = require('secret-stack') const SecretStack = require('secret-stack')
const caps = require('ssb-caps') const caps = require('ssb-caps')
const MsgV2 = require('ppppp-db/msg-v2')
const p = require('util').promisify const p = require('util').promisify
const Algorithm = require('../lib/algorithm') const Algorithm = require('../lib/algorithm')
const { generateKeypair } = require('./util') const { generateKeypair } = require('./util')
@ -34,20 +33,24 @@ test('sync a feed with goal=all', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
const carolKeys = generateKeypair('carol') const carolKeys = generateKeypair('carol')
const carolGroupMsg0 = MsgV2.createGroup(carolKeys, 'carol') const carolGroupRec0 = await p(alice.db.group.create)({
const carolId = MsgV2.getMsgHash(carolGroupMsg0) keys: carolKeys,
await p(alice.db.add)(carolGroupMsg0, carolId) _nonce: 'carol',
await p(bob.db.add)(carolGroupMsg0, carolId) })
const carolId = carolGroupRec0.hash
// Bob knows Alice
await p(bob.db.add)(carolGroupRec0.msg, carolId)
const carolMsgs = [] const carolMsgs = []
for (let i = 1; i <= 10; i++) { for (let i = 1; i <= 10; i++) {
@ -121,20 +124,24 @@ test('sync a feed with goal=newest', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
const carolKeys = generateKeypair('carol') const carolKeys = generateKeypair('carol')
const carolGroupMsg0 = MsgV2.createGroup(carolKeys, 'carol') const carolGroupRec0 = await p(alice.db.group.create)({
const carolId = MsgV2.getMsgHash(carolGroupMsg0) keys: carolKeys,
await p(alice.db.add)(carolGroupMsg0, carolId) _nonce: 'carol',
await p(bob.db.add)(carolGroupMsg0, carolId) })
const carolId = carolGroupRec0.hash
// Bob knows Alice
await p(bob.db.add)(carolGroupRec0.msg, carolId)
const carolMsgs = [] const carolMsgs = []
for (let i = 1; i <= 10; i++) { for (let i = 1; i <= 10; i++) {
@ -208,20 +215,24 @@ test('sync a feed with goal=newest but too far behind', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
const carolKeys = generateKeypair('carol') const carolKeys = generateKeypair('carol')
const carolGroupMsg0 = MsgV2.createGroup(carolKeys, 'carol') const carolGroupRec0 = await p(alice.db.group.create)({
const carolId = MsgV2.getMsgHash(carolGroupMsg0) keys: carolKeys,
await p(alice.db.add)(carolGroupMsg0, carolId) _nonce: 'carol',
await p(bob.db.add)(carolGroupMsg0, carolId) })
const carolId = carolGroupRec0.hash
// Bob knows Alice
await p(bob.db.add)(carolGroupRec0.msg, carolId)
const carolMsgs = [] const carolMsgs = []
for (let i = 1; i <= 10; i++) { for (let i = 1; i <= 10; i++) {

View File

@ -4,7 +4,6 @@ const os = require('os')
const rimraf = require('rimraf') const rimraf = require('rimraf')
const SecretStack = require('secret-stack') const SecretStack = require('secret-stack')
const caps = require('ssb-caps') const caps = require('ssb-caps')
const MsgV2 = require('ppppp-db/msg-v2')
const p = require('util').promisify const p = require('util').promisify
const { generateKeypair } = require('./util') const { generateKeypair } = require('./util')
@ -76,32 +75,38 @@ test('sync a thread where both peers have portions', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
// Alice created Carol
const carolKeys = generateKeypair('carol') const carolKeys = generateKeypair('carol')
const carolGroupMsg0 = MsgV2.createGroup(carolKeys, 'carol') const carolGroupRec0 = await p(alice.db.group.create)({
const carolId = MsgV2.getMsgHash(carolGroupMsg0) keys: carolKeys,
_nonce: 'carol',
})
const carolId = carolGroupRec0.hash
// Alice created Dave
const daveKeys = generateKeypair('dave') const daveKeys = generateKeypair('dave')
const daveGroupMsg0 = MsgV2.createGroup(daveKeys, 'dave') const daveGroupRec0 = await p(alice.db.group.create)({
const daveId = MsgV2.getMsgHash(daveGroupMsg0) keys: daveKeys,
_nonce: 'dave',
})
const daveId = daveGroupRec0.hash
// Alice knows Bob, Carol, and Dave // Alice knows Bob
await p(alice.db.add)(bobGroupMsg0, bobId) await p(alice.db.add)(bobGroupRec0.msg, bobId)
await p(alice.db.add)(carolGroupMsg0, carolId)
await p(alice.db.add)(daveGroupMsg0, daveId)
// Bob knows Alice, Carol, and Dave // Bob knows Alice, Carol, and Dave
await p(bob.db.add)(aliceGroupMsg0, aliceId) await p(bob.db.add)(aliceGroupRec0.msg, aliceId)
await p(bob.db.add)(carolGroupMsg0, carolId) await p(bob.db.add)(carolGroupRec0.msg, carolId)
await p(bob.db.add)(daveGroupMsg0, daveId) await p(bob.db.add)(daveGroupRec0.msg, daveId)
const startA = await p(alice.db.feed.publish)({ const startA = await p(alice.db.feed.publish)({
group: aliceId, group: aliceId,
@ -207,20 +212,20 @@ test('sync a thread where initiator does not have the root', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
// Alice knows Bob // Alice knows Bob
await p(alice.db.add)(bobGroupMsg0, bobId) await p(alice.db.add)(bobGroupRec0.msg, bobId)
// Bob knows Alice // Bob knows Alice
await p(bob.db.add)(aliceGroupMsg0, aliceId) await p(bob.db.add)(aliceGroupRec0.msg, aliceId)
const rootA = await p(alice.db.feed.publish)({ const rootA = await p(alice.db.feed.publish)({
group: aliceId, group: aliceId,
@ -290,20 +295,20 @@ test('sync a thread where receiver does not have the root', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
// Alice knows Bob // Alice knows Bob
await p(alice.db.add)(bobGroupMsg0, bobId) await p(alice.db.add)(bobGroupRec0.msg, bobId)
// Bob knows Alice // Bob knows Alice
await p(bob.db.add)(aliceGroupMsg0, aliceId) await p(bob.db.add)(aliceGroupRec0.msg, aliceId)
const rootA = await p(alice.db.feed.publish)({ const rootA = await p(alice.db.feed.publish)({
group: aliceId, group: aliceId,
@ -372,20 +377,20 @@ test('sync a thread with reactions too', async (t) => {
}) })
await alice.db.loaded() await alice.db.loaded()
const aliceGroupMsg0 = MsgV2.createGroup(aliceKeys, 'alice') const aliceGroupRec0 = await p(alice.db.group.create)({ _nonce: 'alice' })
const aliceId = MsgV2.getMsgHash(aliceGroupMsg0) const aliceId = aliceGroupRec0.hash
await p(alice.db.add)(aliceGroupMsg0, aliceId) await p(alice.db.add)(aliceGroupRec0.msg, aliceId)
await bob.db.loaded() await bob.db.loaded()
const bobGroupMsg0 = MsgV2.createGroup(bobKeys, 'bob') const bobGroupRec0 = await p(bob.db.group.create)({ _nonce: 'bob' })
const bobId = MsgV2.getMsgHash(bobGroupMsg0) const bobId = bobGroupRec0.hash
await p(bob.db.add)(bobGroupMsg0, bobId) await p(bob.db.add)(bobGroupRec0.msg, bobId)
// Alice knows Bob // Alice knows Bob
await p(alice.db.add)(bobGroupMsg0, bobId) await p(alice.db.add)(bobGroupRec0.msg, bobId)
// Bob knows Alice // Bob knows Alice
await p(bob.db.add)(aliceGroupMsg0, aliceId) await p(bob.db.add)(aliceGroupRec0.msg, aliceId)
const rootA = await p(alice.db.feed.publish)({ const rootA = await p(alice.db.feed.publish)({
group: aliceId, group: aliceId,