From 3f70f4ddd228ef010460a7f4f9f0a213c494c12d Mon Sep 17 00:00:00 2001 From: Hayden Young Date: Fri, 24 Feb 2023 00:46:29 +0000 Subject: [PATCH] refactor: Do not return hash as part of iterator result. --- src/db/event-store.js | 2 +- src/db/keyvalue.js | 2 +- test/db/event-store.test.js | 38 ++++++++++++++++++------------------- test/db/keyvalue.test.js | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/db/event-store.js b/src/db/event-store.js index f6080c8..5e1d43a 100644 --- a/src/db/event-store.js +++ b/src/db/event-store.js @@ -19,7 +19,7 @@ const Events = async ({ OpLog, Database, ipfs, identity, databaseId, accessContr const iterator = async function * ({ gt, gte, lt, lte, amount } = {}) { const it = log.iterator({ gt, gte, lt, lte, amount }) for await (const event of it) { - yield { hash: event.hash, value: event.payload.value } + yield event.payload.value } } diff --git a/src/db/keyvalue.js b/src/db/keyvalue.js index d81c605..a6b280d 100644 --- a/src/db/keyvalue.js +++ b/src/db/keyvalue.js @@ -28,7 +28,7 @@ const KeyValue = async ({ OpLog, Database, ipfs, identity, databaseId, accessCon const { op, key, value } = entry.payload if (op === 'PUT' && !keys[key]) { keys[key] = true - yield { hash: entry.hash, value: { key, value } } + yield { key, value } } else if (op === 'DEL' && !keys[key]) { keys[key] = true } diff --git a/test/db/event-store.test.js b/test/db/event-store.test.js index 10c40c7..ef54f6f 100644 --- a/test/db/event-store.test.js +++ b/test/db/event-store.test.js @@ -105,7 +105,7 @@ Object.keys(testAPIs).forEach((IPFS) => { const all = await db.all() - deepStrictEqual(all.map(e => e.value), events) + deepStrictEqual(all, events) }) describe('Iterator Options', () => { @@ -128,7 +128,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 1) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns two items', async () => { @@ -140,7 +140,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 2) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns three items', async () => { @@ -152,7 +152,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 3) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('sets \'amount\' greater than items available', async () => { @@ -164,7 +164,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 5) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('sets \'amount\' to 0', async () => { @@ -176,7 +176,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 0) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) }) @@ -190,7 +190,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 4) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns one item less than head', async () => { @@ -202,7 +202,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 1) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns two items less than head', async () => { @@ -214,7 +214,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 2) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) }) @@ -228,7 +228,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 5) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns one item less than or equal to head', async () => { @@ -240,7 +240,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 1) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns two items less than or equal to head', async () => { @@ -252,7 +252,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 2) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) }) @@ -266,7 +266,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 4) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns one item greater than root', async () => { @@ -278,7 +278,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 1) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns two items greater than root', async () => { @@ -290,7 +290,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 2) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) }) @@ -304,7 +304,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 5) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns one item greater than or equal to root', async () => { @@ -316,7 +316,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 1) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) it('returns two items greater than or equal to root', async () => { @@ -328,7 +328,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 2) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) }) @@ -342,7 +342,7 @@ Object.keys(testAPIs).forEach((IPFS) => { } strictEqual(all.length, 3) - deepStrictEqual(all.map(e => e.value), expected) + deepStrictEqual(all, expected) }) }) }) diff --git a/test/db/keyvalue.test.js b/test/db/keyvalue.test.js index f3a2f88..20b5e1c 100644 --- a/test/db/keyvalue.test.js +++ b/test/db/keyvalue.test.js @@ -182,7 +182,7 @@ Object.keys(testAPIs).forEach((IPFS) => { all.unshift(pair) } - deepStrictEqual(all.map(e => e.value), keyvalue) + deepStrictEqual(all, keyvalue) }) }) })