@fireproof/core 0.19.99 → 0.19.101

package/tests/blockstore/store.test.ts

@@ -1,21 +1,18 @@
 import { CID } from "multiformats";
-import { bs, NotFoundError, SuperThis } from "@fireproof/core";
-import { mockSuperThis } from "../helpers";
-
-const decoder = new TextDecoder("utf-8");
+import { bs, NotFoundError, SuperThis, rt } from "@fireproof/core";
+import { mockSuperThis, noopUrl } from "../helpers";
 
 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,
+    keybag: await rt.kb.getKeyBag(sthis),
+  };
 }
 
 describe("DataStore", function () {
@@ -30,7 +27,7 @@ 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);
   });
@@ -46,7 +43,7 @@ describe("DataStore", function () {
     };
     await store.save(car);
     const data = await raw.get(store.url(), car.cid.toString());
-    expect(decoder.decode(data)).toEqual(decoder.decode(car.bytes));
+    expect(sthis.txt.decode(data)).toEqual(sthis.txt.decode(car.bytes));
   });
 });
 
@@ -54,7 +51,6 @@ describe("DataStore with a saved car", function () {
   let store: bs.DataStore;
   let raw: bs.TestGateway;
   let car: bs.AnyBlock;
-
   const sthis = mockSuperThis();
 
   afterEach(async () => {
@@ -64,9 +60,10 @@ 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);
+    raw = await bs.testStoreFactory(store.url(), sthis);
     car = {
       cid: "cid" as unknown as CID,
       bytes: new Uint8Array([55, 56, 57, 80]),
@@ -76,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());
-    expect(decoder.decode(data)).toEqual(decoder.decode(car.bytes));
+    expect(sthis.txt.decode(data)).toEqual(sthis.txt.decode(car.bytes));
   });
 
   it("should load a car", async function () {
@@ -106,7 +103,7 @@ 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);
   });
@@ -136,6 +133,7 @@ describe("MetaStore with a saved header", function () {
   let raw: bs.TestGateway;
   let cid: CID;
   const sthis = mockSuperThis();
+  // let onload: bs.DbMeta[];
 
   afterEach(async () => {
     await store.close();
@@ -144,16 +142,22 @@ 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 = decoder.decode(bytes);
+    const data = sthis.txt.decode(bytes);
     expect(data).toMatch(/parents/);
     const header = JSON.parse(data)[0];
     expect(header).toBeDefined();

package/tests/blockstore/transaction.test.ts

@@ -1,16 +1,16 @@
 import { CID } from "multiformats";
 import { bs, SuperThis } from "@fireproof/core";
-import { mockSuperThis } from "../helpers";
+import { mockSuperThis, simpleBlockOpts } from "../helpers";
 
 describe("Fresh TransactionBlockstore", function () {
   let blocks: bs.BaseBlockstore;
   const sthis = mockSuperThis();
   beforeEach(function () {
-    blocks = new bs.BaseBlockstore();
-  });
-  it("should not have a name", function () {
-    expect(blocks.name).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();
   });
@@ -34,12 +34,12 @@ describe("Fresh TransactionBlockstore", function () {
 describe("TransactionBlockstore with name", function () {
   let blocks: bs.EncryptedBlockstore;
   const sthis = mockSuperThis();
-  beforeEach(function () {
-    blocks = new bs.EncryptedBlockstore(sthis, { name: "test" });
-  });
-  it("should have a name", function () {
-    expect(blocks.name).toEqual("test");
+  beforeEach(async function () {
+    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();
   });
@@ -59,7 +59,7 @@ describe("A transaction", function () {
   let blocks: bs.EncryptedBlockstore;
   const sthis = mockSuperThis();
   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);
   });
@@ -89,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));