@fireproof/core 0.19.8-dev-global → 0.19.11-dev-dryrun

package/tests/blockstore/store.test.ts

@@ -1,16 +1,16 @@
 import { CID } from "multiformats";
-import { rt, bs } from "@fireproof/core";
-import { MockLogger } from "@adviser/cement";
-import { NotFoundError } from "../../src/blockstore/gateway";
+import { bs, NotFoundError, SuperThis } from "@fireproof/core";
+import { mockSuperThis } from "../helpers";
 
 const decoder = new TextDecoder("utf-8");
 
-function runtime() {
-  return bs.toStoreRuntime({}, MockLogger().logger);
+function runtime(sthis: SuperThis) {
+  return bs.toStoreRuntime({}, sthis);
 }
 
-function mockLoader(name: string): bs.Loadable {
+function mockLoader(sthis: SuperThis, name: string): bs.Loadable {
   return {
+    sthis,
     name,
     ebOpts: {
       store: {},
@@ -20,18 +20,19 @@ function mockLoader(name: string): bs.Loadable {
 
 describe("DataStore", function () {
   let store: bs.DataStore;
-  let raw: bs.TestStore;
+  let raw: bs.TestGateway;
 
+  const sthis = mockSuperThis();
   afterEach(async () => {
     await store.close();
     await store.destroy();
   });
 
   beforeEach(async () => {
-    await rt.SysContainer.start();
-    store = await runtime().makeDataStore(mockLoader("test"));
+    await sthis.start();
+    store = await runtime(sthis).makeDataStore(mockLoader(sthis, "test"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url);
+    raw = await bs.testStoreFactory(store.url(), sthis);
   });
 
   it("should have a name", function () {
@@ -44,26 +45,28 @@ describe("DataStore", function () {
       bytes: new Uint8Array([55, 56, 57]),
     };
     await store.save(car);
-    const data = await raw.get(store.url, car.cid.toString());
+    const data = await raw.get(store.url(), car.cid.toString());
     expect(decoder.decode(data)).toEqual(decoder.decode(car.bytes));
   });
 });
 
 describe("DataStore with a saved car", function () {
   let store: bs.DataStore;
-  let raw: bs.TestStore;
+  let raw: bs.TestGateway;
   let car: bs.AnyBlock;
 
+  const sthis = mockSuperThis();
+
   afterEach(async () => {
     await store.close();
     await store.destroy();
   });
 
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    store = await runtime().makeDataStore(mockLoader("test2"));
+    await sthis.start();
+    store = await runtime(sthis).makeDataStore(mockLoader(sthis, "test2"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url);
+    raw = await bs.testStoreFactory(store.url(), sthis);
     car = {
       cid: "cid" as unknown as CID,
       bytes: new Uint8Array([55, 56, 57, 80]),
@@ -72,7 +75,7 @@ describe("DataStore with a saved car", function () {
   });
 
   it("should have a car", async function () {
-    const data = await raw.get(store.url, car.cid.toString());
+    const data = await raw.get(store.url(), car.cid.toString());
     expect(decoder.decode(data)).toEqual(decoder.decode(car.bytes));
   });
 
@@ -85,15 +88,16 @@ describe("DataStore with a saved car", function () {
 
   it("should remove a car", async function () {
     await store.remove(car.cid);
-    const error = (await store.load(car.cid).catch((e: Error) => e)) as NotFoundError;
-    expect(error.code).toMatch("ENOENT");
-    // matches(error.message, "ENOENT");
+    const { e: error } = (await store.load(car.cid).catch((e: Error) => ({ e }))) as { e: NotFoundError };
+    expect(error).toBeTruthy();
   });
 });
 
 describe("MetaStore", function () {
   let store: bs.MetaStore;
-  let raw: bs.TestStore;
+  let raw: bs.TestGateway;
+
+  const sthis = mockSuperThis();
 
   afterEach(async () => {
     await store.close();
@@ -101,10 +105,10 @@ describe("MetaStore", function () {
   });
 
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    store = await runtime().makeMetaStore(mockLoader("test"));
+    await sthis.start();
+    store = await runtime(sthis).makeMetaStore(mockLoader(sthis, "test"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url);
+    raw = await bs.testStoreFactory(store.url(), sthis);
   });
 
   it("should have a name", function () {
@@ -115,21 +119,23 @@ describe("MetaStore", function () {
     const cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
     const h: bs.DbMeta = {
       cars: [cid],
-      key: undefined,
+      // key: undefined,
     };
     await store.save(h);
-    const file = await raw.get(store.url, "main");
-    const header = JSON.parse(decoder.decode(file));
-    expect(header).toBeTruthy();
-    expect(header.cars).toBeTruthy();
-    expect(header.cars[0]["/"]).toEqual(cid.toString());
+    const file = await raw.get(store.url(), "main");
+    const [blockMeta] = await store.handleByteHeads(file);
+    const decodedHeader = blockMeta.dbMeta;
+    expect(decodedHeader).toBeTruthy();
+    expect(decodedHeader.cars).toBeTruthy();
+    expect(decodedHeader.cars[0].toString()).toEqual(cid.toString());
   });
 });
 
 describe("MetaStore with a saved header", function () {
   let store: bs.MetaStore;
-  let raw: bs.TestStore;
+  let raw: bs.TestGateway;
   let cid: CID;
+  const sthis = mockSuperThis();
 
   afterEach(async () => {
     await store.close();
@@ -137,21 +143,26 @@ describe("MetaStore with a saved header", function () {
   });
 
   beforeEach(async function () {
-    await rt.SysContainer.start();
-    store = await runtime().makeMetaStore(mockLoader("test-saved-header"));
+    await sthis.start();
+    store = await runtime(sthis).makeMetaStore(mockLoader(sthis, "test-saved-header"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url);
+    raw = await bs.testStoreFactory(store.url(), sthis);
     cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
-    await store.save({ cars: [cid], key: undefined });
+    await store.save({ cars: [cid] /*, key: undefined */ });
   });
 
   it("should have a header", async function () {
-    const data = decoder.decode(await raw.get(store.url, "main"));
-    expect(data).toMatch(/car/);
-    const header = JSON.parse(data);
-    expect(header).toBeTruthy();
-    expect(header.cars).toBeTruthy();
-    expect(header.cars[0]["/"]).toEqual(cid.toString());
+    const bytes = await raw.get(store.url(), "main");
+    const data = decoder.decode(bytes);
+    expect(data).toMatch(/parents/);
+    const header = JSON.parse(data)[0];
+    expect(header).toBeDefined();
+    expect(header.parents).toBeDefined();
+    const [blockMeta] = await store.handleByteHeads(bytes);
+    const decodedHeader = blockMeta.dbMeta;
+    expect(decodedHeader).toBeDefined();
+    expect(decodedHeader.cars).toBeDefined();
+    expect(decodedHeader.cars[0].toString()).toEqual(cid.toString());
   });
 
   it("should load a header", async function () {

package/tests/blockstore/transaction.test.ts

@@ -1,9 +1,10 @@
 import { CID } from "multiformats";
-// import { matches, equalsJSON } from "../helpers.js";
-import { bs } from "@fireproof/core";
+import { bs, SuperThis } from "@fireproof/core";
+import { mockSuperThis } from "../helpers";
 
 describe("Fresh TransactionBlockstore", function () {
   let blocks: bs.BaseBlockstore;
+  const sthis = mockSuperThis();
   beforeEach(function () {
     blocks = new bs.BaseBlockstore();
   });
@@ -14,7 +15,7 @@ describe("Fresh TransactionBlockstore", function () {
     expect(blocks.loader).toBeFalsy();
   });
   it("should not put", async function () {
-    const value = new TextEncoder().encode("value");
+    const value = sthis.txt.encode("value");
     const e = await blocks.put("key" as unknown as bs.AnyLink, value).catch((e) => e);
     expect(e.message).toMatch(/transaction/g);
   });
@@ -32,8 +33,9 @@ describe("Fresh TransactionBlockstore", function () {
 
 describe("TransactionBlockstore with name", function () {
   let blocks: bs.EncryptedBlockstore;
+  const sthis = mockSuperThis();
   beforeEach(function () {
-    blocks = new bs.EncryptedBlockstore({ name: "test" });
+    blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
   });
   it("should have a name", function () {
     expect(blocks.name).toEqual("test");
@@ -42,7 +44,7 @@ describe("TransactionBlockstore with name", function () {
     expect(blocks.loader).toBeTruthy();
   });
   it("should get from loader", async function () {
-    const bytes = new TextEncoder().encode("bytes");
+    const bytes = sthis.txt.encode("bytes");
     expect(blocks.loader).toBeTruthy();
     blocks.loader.getBlock = async (cid) => {
       return { cid, bytes };
@@ -55,14 +57,15 @@ describe("TransactionBlockstore with name", function () {
 describe("A transaction", function () {
   let tblocks: bs.CarTransaction;
   let blocks: bs.EncryptedBlockstore;
+  const sthis = mockSuperThis();
   beforeEach(async function () {
-    blocks = new bs.EncryptedBlockstore({ name: "test" });
+    blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
     tblocks = new bs.CarTransaction(blocks);
     blocks.transactions.add(tblocks);
   });
   it("should put and get", async function () {
     const cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
-    const bytes = new TextEncoder().encode("bytes");
+    const bytes = sthis.txt.encode("bytes");
     await tblocks.put(cid, bytes);
     expect(blocks.transactions.has(tblocks)).toBeTruthy();
     const got = await tblocks.get(cid);
@@ -72,14 +75,15 @@ describe("A transaction", function () {
   });
 });
 
-function asUInt8Array(str: string) {
-  return new TextEncoder().encode(str);
+function asUInt8Array(str: string, sthis: SuperThis) {
+  return sthis.txt.encode(str);
 }
 
 describe("TransactionBlockstore with a completed transaction", function () {
   let blocks: bs.BaseBlockstore;
   let cid: CID;
   let cid2: CID;
+  const sthis = mockSuperThis();
 
   beforeEach(async function () {
     cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
@@ -87,13 +91,13 @@ describe("TransactionBlockstore with a completed transaction", function () {
 
     blocks = new bs.BaseBlockstore();
     await blocks.transaction(async (tblocks) => {
-      await tblocks.put(cid, asUInt8Array("value"));
-      await tblocks.put(cid2, asUInt8Array("value2"));
+      await tblocks.put(cid, asUInt8Array("value", sthis));
+      await tblocks.put(cid, asUInt8Array("value", sthis));
       return { head: [] };
     });
     await blocks.transaction(async (tblocks) => {
-      await tblocks.put(cid, asUInt8Array("value"));
-      await tblocks.put(cid2, asUInt8Array("value2"));
+      await tblocks.put(cid, asUInt8Array("value", sthis));
+      await tblocks.put(cid2, asUInt8Array("value2", sthis));
       return { head: [] };
     });
   });
@@ -104,10 +108,10 @@ describe("TransactionBlockstore with a completed transaction", function () {
   it("should get", async function () {
     const value = (await blocks.get(cid)) as bs.AnyBlock;
     expect(value.cid).toEqual(cid);
-    expect(value.bytes.toString()).toEqual(asUInt8Array("value").toString());
+    expect(value.bytes.toString()).toEqual(asUInt8Array("value", sthis).toString());
 
     const value2 = (await blocks.get(cid2)) as bs.AnyBlock;
-    expect(value2.bytes.toString()).toEqual(asUInt8Array("value2").toString());
+    expect(value2.bytes.toString()).toEqual(asUInt8Array("value2", sthis).toString());
   });
   it("should yield entries", async function () {
     const blz = [];