@fireproof/core 0.19.121 → 0.20.0-dev-preview-05

package/tests/blockstore/store.test.ts

@@ -1,23 +1,27 @@
 import { CID } from "multiformats";
-import { bs, ensureSuperThis, NotFoundError, SuperThis } from "@fireproof/core";
+import { rt, bs, NotFoundError, SuperThis, PARAM, DbMeta, ensureSuperThis } from "@fireproof/core";
+import { noopUrl } from "../helpers.js";
+import { Result } from "@adviser/cement";
 
 function runtime(sthis: SuperThis) {
-  return bs.toStoreRuntime({}, sthis);
+  return bs.toStoreRuntime(sthis);
 }
 
-function mockLoader(sthis: SuperThis, name: string): bs.Loadable {
+async function mockLoader(sthis: SuperThis, name?: string): Promise<bs.StoreFactoryItem> {
+  const url = noopUrl(name);
   return {
     sthis,
-    name,
-    ebOpts: {
-      store: {},
-    },
-  } as bs.Loadable;
+    url: url,
+    loader: {
+      keyBag: () => rt.kb.getKeyBag(sthis),
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      handleDbMetasFromStore: (metas: DbMeta[]): Promise<void> => Promise.resolve(),
+    } as bs.Loader,
+  };
 }
 
 describe("DataStore", function () {
   let store: bs.DataStore;
-  let raw: bs.TestGateway;
 
   const sthis = ensureSuperThis();
   afterEach(async () => {
@@ -27,13 +31,12 @@ describe("DataStore", function () {
 
   beforeEach(async () => {
     await sthis.start();
-    store = await runtime(sthis).makeDataStore(mockLoader(sthis, "test"));
+    store = await runtime(sthis).makeDataStore(await mockLoader(sthis));
     await store.start();
-    raw = await bs.testStoreFactory(store.url(), sthis);
   });
 
   it("should have a name", function () {
-    expect(store.name).toEqual("test");
+    expect(store.url().getParam(PARAM.NAME)).toEqual("test");
   });
 
   it("should save a car", async function () {
@@ -42,14 +45,13 @@ 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 store.realGateway.getPlain(sthis, store.url(), car.cid.toString())).Ok();
     expect(sthis.txt.decode(data)).toEqual(sthis.txt.decode(car.bytes));
   });
 });
 
 describe("DataStore with a saved car", function () {
   let store: bs.DataStore;
-  let raw: bs.TestGateway;
   let car: bs.AnyBlock;
 
   const sthis = ensureSuperThis();
@@ -61,9 +63,8 @@ describe("DataStore with a saved car", function () {
 
   beforeEach(async function () {
     await sthis.start();
-    store = await runtime(sthis).makeDataStore(mockLoader(sthis, "test2"));
+    store = await runtime(sthis).makeDataStore(await mockLoader(sthis, "test2"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url(), sthis);
     car = {
       cid: "cid" as unknown as CID,
       bytes: new Uint8Array([55, 56, 57, 80]),
@@ -72,7 +73,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 store.realGateway.getPlain(sthis, store.url(), car.cid.toString())).Ok();
     expect(sthis.txt.decode(data)).toEqual(sthis.txt.decode(car.bytes));
   });
 
@@ -92,7 +93,6 @@ describe("DataStore with a saved car", function () {
 
 describe("MetaStore", function () {
   let store: bs.MetaStore;
-  let raw: bs.TestGateway;
 
   const sthis = ensureSuperThis();
 
@@ -103,13 +103,12 @@ describe("MetaStore", function () {
 
   beforeEach(async function () {
     await sthis.start();
-    store = await runtime(sthis).makeMetaStore(mockLoader(sthis, "test"));
+    store = await runtime(sthis).makeMetaStore(await mockLoader(sthis, "test"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url(), sthis);
   });
 
   it("should have a name", function () {
-    expect(store.name).toEqual("test");
+    expect(store.url().getParam(PARAM.NAME)).toEqual("test");
   });
 
   it("should save a header", async function () {
@@ -119,9 +118,11 @@ describe("MetaStore", function () {
       // key: undefined,
     };
     await store.save(h);
-    const file = await raw.get(store.url(), "main");
-    const [blockMeta] = await store.handleByteHeads(file);
-    const decodedHeader = blockMeta.dbMeta;
+    const file = await store.realGateway.getPlain(sthis, store.url(), "main");
+    const blockMeta = (await rt.gw.fpDeserialize(sthis, store.url(), file)) as Result<bs.FPEnvelopeMeta>;
+    expect(blockMeta.Ok()).toBeTruthy();
+    expect(blockMeta.Ok().payload.length).toEqual(1);
+    const decodedHeader = blockMeta.Ok().payload[0].dbMeta;
     expect(decodedHeader).toBeTruthy();
     expect(decodedHeader.cars).toBeTruthy();
     expect(decodedHeader.cars[0].toString()).toEqual(cid.toString());
@@ -130,7 +131,6 @@ describe("MetaStore", function () {
 
 describe("MetaStore with a saved header", function () {
   let store: bs.MetaStore;
-  let raw: bs.TestGateway;
   let cid: CID;
   const sthis = ensureSuperThis();
 
@@ -141,22 +141,31 @@ describe("MetaStore with a saved header", function () {
 
   beforeEach(async function () {
     await sthis.start();
-    store = await runtime(sthis).makeMetaStore(mockLoader(sthis, "test-saved-header"));
+    store = await runtime(sthis).makeMetaStore(await mockLoader(sthis, "test-saved-header"));
     await store.start();
-    raw = await bs.testStoreFactory(store.url(), sthis);
     cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
     await store.save({ cars: [cid] /*, key: undefined */ });
   });
 
+  // it("should load", async function () {
+  //   expect(onload).toBeTruthy();
+  //   expect(onload?.length).toEqual(1);
+  //   expect(onload?.[0].cars.toString()).toEqual(cid.toString());
+  // });
+
   it("should have a header", async function () {
-    const bytes = await raw.get(store.url(), "main");
-    const data = sthis.txt.decode(bytes);
+    const bytes = await store.realGateway.getPlain(sthis, store.url(), "main");
+    const data = sthis.txt.decode(bytes.Ok());
     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;
+    // const [blockMeta] = await store.handleByteHeads(bytes);
+
+    const blockMeta = (await rt.gw.fpDeserialize(sthis, store.url(), bytes)) as Result<bs.FPEnvelopeMeta>;
+    expect(blockMeta.Ok()).toBeTruthy();
+    expect(blockMeta.Ok().payload.length).toEqual(1);
+    const decodedHeader = blockMeta.Ok().payload[0].dbMeta;
     expect(decodedHeader).toBeDefined();
     expect(decodedHeader.cars).toBeDefined();
     expect(decodedHeader.cars[0].toString()).toEqual(cid.toString());

package/tests/blockstore/transaction.test.ts

@@ -1,18 +1,19 @@
 import { CID } from "multiformats";
 import { bs, ensureSuperThis, SuperThis } from "@fireproof/core";
+import { simpleBlockOpts } from "../helpers.js";
 
 describe("Fresh TransactionBlockstore", function () {
   let blocks: bs.BaseBlockstore;
   const sthis = ensureSuperThis();
   beforeEach(function () {
-    blocks = new bs.BaseBlockstore();
-  });
-  it("should not have a name", function () {
-    expect(blocks.name).toBeFalsy();
-  });
-  it("should not have a loader", function () {
-    expect(blocks.loader).toBeFalsy();
+    blocks = new bs.BaseBlockstore(simpleBlockOpts(sthis));
   });
+  // it("should not have a name", function () {
+  //   expect(blocks.name).toBeFalsy();
+  // });
+  // it("should not have a loader", function () {
+  //   expect(blocks.loader).toBeFalsy();
+  // });
   it("should not put", async function () {
     const value = sthis.txt.encode("value");
     const e = await blocks.put("key" as unknown as bs.AnyLink, value).catch((e) => e);
@@ -34,11 +35,11 @@ describe("TransactionBlockstore with name", function () {
   let blocks: bs.EncryptedBlockstore;
   const sthis = ensureSuperThis();
   beforeEach(function () {
-    blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
-  });
-  it("should have a name", function () {
-    expect(blocks.name).toEqual("test");
+    blocks = new bs.EncryptedBlockstore(sthis, simpleBlockOpts(sthis));
   });
+  // it("should have a name", function () {
+  //   expect(blocks.name).toEqual("test");
+  // });
   it("should have a loader", function () {
     expect(blocks.loader).toBeTruthy();
   });
@@ -58,7 +59,7 @@ describe("A transaction", function () {
   let blocks: bs.EncryptedBlockstore;
   const sthis = ensureSuperThis();
   beforeEach(async function () {
-    blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
+    blocks = new bs.EncryptedBlockstore(sthis, simpleBlockOpts(sthis, "test"));
     tblocks = new bs.CarTransaction(blocks);
     blocks.transactions.add(tblocks);
   });
@@ -88,7 +89,7 @@ describe("TransactionBlockstore with a completed transaction", function () {
     cid = CID.parse("bafybeia4luuns6dgymy5kau5rm7r4qzrrzg6cglpzpogussprpy42cmcn4");
     cid2 = CID.parse("bafybeibgouhn5ktecpjuovt52zamzvm4dlve5ak7x6d5smms3itkhplnhm");
 
-    blocks = new bs.BaseBlockstore();
+    blocks = new bs.BaseBlockstore(simpleBlockOpts(sthis));
     await blocks.transaction(async (tblocks) => {
       await tblocks.put(cid, asUInt8Array("value", sthis));
       await tblocks.put(cid, asUInt8Array("value", sthis));