fix: tryorama tests

Author: zippy

tests/src/common.ts

@@ -1,51 +1,21 @@
 import { fileURLToPath } from "url";
 import path from "path";
-import {
-  AppBundle,
-  AppBundleSource,
-  CellProvisioningStrategy,
-} from "@holochain/client";
+import { AppBundleSource } from "@holochain/client";
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const createMewsFeedAppBundleSource = (
-  properties: any = {}
-): AppBundleSource => {
-  return {
-    bundle: {
-      manifest: {
-        manifest_version: "1",
-        name: "mewsfeed",
-        roles: [
-          {
-            name: "mewsfeed",
-            provisioning: {
-              strategy: CellProvisioningStrategy.Create,
-              deferred: false,
-            },
-            dna: {
-              path: path.join(
-                __dirname,
-                "../../dnas/mewsfeed/workdir/mewsfeed.dna"
-              ),
-              modifiers: {
-                properties,
-              },
-            },
-          },
-        ],
-      },
-      resources: {},
-    },
-  };
+export const mewsfeedAppBundleSource: AppBundleSource = {
+  type: "path",
+  value: path.join(__dirname, "../../workdir/mewsfeed.happ"),
 };
 
-export const mewsfeedAppBundleSource: AppBundleSource =
-  createMewsFeedAppBundleSource({
-    mew_characters_min: 5,
-    mew_characters_max: 200,
-    prefix_index_width: 3,
-  });
+export const mewsfeedAppBundleSourceNoLengthLimits: AppBundleSource = {
+  type: "path",
+  value: path.join(__dirname, "../../workdir/mewsfeed.happ"),
+};
 
-export const mewsfeedAppBundleSourceNoLengthLimits: AppBundleSource =
-  createMewsFeedAppBundleSource();
+// Helper to wrap inputs in ZomeFnInput format for the new API
+export function wrapInput<T>(input: T, local: boolean = true): { input: T; local: boolean } {
+  return { input, local };
+}

tests/src/mewsfeed/agent_pins/pinner-to-hashes.test.ts

@@ -2,16 +2,13 @@ import { assert, test } from "vitest";
 
 import { runScenario, dhtSync } from "@holochain/tryorama";
 import { AgentPubKey, HoloHash, fakeActionHash } from "@holochain/client";
+import { mewsfeedAppBundleSource, wrapInput } from "../../common";
 
 test("link a Pinner to a Hash", async () => {
   await runScenario(
     async (scenario) => {
-      // Construct proper paths for your app.
-      // This assumes app bundle created by the `hc app pack` command.
-      const testAppPath = process.cwd() + "/../workdir/mewsfeed.happ";
-
       // Set up the app to be installed
-      const appSource = { appBundleSource: { path: testAppPath } };
+      const appSource = { appBundleSource: mewsfeedAppBundleSource };
 
       // Add 2 players with the test app to the Scenario. The returned players
       // can be destructured.
@@ -27,7 +24,7 @@ test("link a Pinner to a Hash", async () => {
       let linksOutput: HoloHash[] = await bob.cells[0].callZome({
         zome_name: "agent_pins",
         fn_name: "get_hashes_for_pinner",
-        payload: baseAddress,
+        payload: wrapInput(baseAddress),
       });
       assert.equal(linksOutput.length, 0);
 
@@ -44,7 +41,7 @@ test("link a Pinner to a Hash", async () => {
       linksOutput = await bob.cells[0].callZome({
         zome_name: "agent_pins",
         fn_name: "get_hashes_for_pinner",
-        payload: baseAddress,
+        payload: wrapInput(baseAddress),
       });
 
       assert.equal(linksOutput.length, 1);
@@ -53,7 +50,7 @@ test("link a Pinner to a Hash", async () => {
       const pinnersOutput: AgentPubKey[] = await bob.cells[0].callZome({
         zome_name: "agent_pins",
         fn_name: "get_pinners_for_hash",
-        payload: targetHash,
+        payload: wrapInput(targetHash),
       });
       assert.equal(pinnersOutput.length, 1);
 
@@ -69,15 +66,15 @@ test("link a Pinner to a Hash", async () => {
       linksOutput = await bob.cells[0].callZome({
         zome_name: "agent_pins",
         fn_name: "get_hashes_for_pinner",
-        payload: baseAddress,
+        payload: wrapInput(baseAddress),
       });
       assert.equal(linksOutput.length, 0);
 
       // Bob gets the links in the inverse direction
       linksOutput = await bob.cells[0].callZome({
         zome_name: "agent_pins",
         fn_name: "get_pinners_for_hash",
-        payload: targetHash,
+        payload: wrapInput(targetHash),
       });
 
       assert.equal(linksOutput.length, 0);

tests/src/mewsfeed/follows/follower-to-creators.test.ts

@@ -1,7 +1,7 @@
 import { assert, test, expect } from "vitest";
 import { runScenario, dhtSync } from "@holochain/tryorama";
 import { AgentPubKey, Record } from "@holochain/client";
-import { mewsfeedAppBundleSource } from "../../common";
+import { mewsfeedAppBundleSource, wrapInput } from "../../common";
 
 test("link a Follower to a Creator", async () => {
   await runScenario(
@@ -23,9 +23,9 @@ test("link a Follower to a Creator", async () => {
       let linksOutput: Record[] = await bob.cells[0].callZome({
         zome_name: "follows",
         fn_name: "get_creators_for_follower",
-        payload: {
+        payload: wrapInput({
           follower: baseAddress,
-        },
+        }),
       });
       assert.equal(linksOutput.length, 0);
 
@@ -45,19 +45,19 @@ test("link a Follower to a Creator", async () => {
       linksOutput = await bob.cells[0].callZome({
         zome_name: "follows",
         fn_name: "get_creators_for_follower",
-        payload: {
+        payload: wrapInput({
           follower: baseAddress,
-        },
+        }),
       });
       assert.equal(linksOutput.length, 1);
 
       // Bob gets the links in the inverse direction
       linksOutput = await bob.cells[0].callZome({
         zome_name: "follows",
         fn_name: "get_followers_for_creator",
-        payload: {
+        payload: wrapInput({
           creator: targetAddress,
-        },
+        }),
       });
       assert.equal(linksOutput.length, 1);
 
@@ -76,19 +76,19 @@ test("link a Follower to a Creator", async () => {
       linksOutput = await bob.cells[0].callZome({
         zome_name: "follows",
         fn_name: "get_creators_for_follower",
-        payload: {
+        payload: wrapInput({
           follower: baseAddress,
-        },
+        }),
       });
       assert.equal(linksOutput.length, 0);
 
       // Bob gets the links in the inverse direction
       linksOutput = await bob.cells[0].callZome({
         zome_name: "follows",
         fn_name: "get_followers_for_creator",
-        payload: {
+        payload: wrapInput({
           creator: targetAddress,
-        },
+        }),
       });
       assert.equal(linksOutput.length, 0);
     },
@@ -257,12 +257,12 @@ test(
         const page1: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_creators_for_follower",
-          payload: {
+          payload: wrapInput({
             follower: alice.agentPubKey,
             page: {
               limit: 2,
             },
-          },
+          }),
         });
 
         assert.deepEqual(page1[0], mary.agentPubKey);
@@ -271,41 +271,41 @@ test(
         const page2: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_creators_for_follower",
-          payload: {
+          payload: wrapInput({
             follower: alice.agentPubKey,
             page: {
               after_agentpubkey: page1[1],
               limit: 2,
             },
-          },
+          }),
         });
         assert.deepEqual(page2[0], john.agentPubKey);
         assert.deepEqual(page2[1], carol.agentPubKey);
 
         const page3: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_creators_for_follower",
-          payload: {
+          payload: wrapInput({
             follower: alice.agentPubKey,
             page: {
               after_agentpubkey: page2[1],
               limit: 2,
             },
-          },
+          }),
         });
         assert.lengthOf(page3, 1);
         assert.deepEqual(page3[0], bob.agentPubKey);
 
         const page5: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_creators_for_follower",
-          payload: {
+          payload: wrapInput({
             follower: alice.agentPubKey,
             page: {
               after_agentpubkey: page3[0],
               limit: 2,
             },
-          },
+          }),
         });
         assert.lengthOf(page5, 0);
       },
@@ -386,12 +386,12 @@ test(
         const page1: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_followers_for_creator",
-          payload: {
+          payload: wrapInput({
             creator: alice.agentPubKey,
             page: {
               limit: 2,
             },
-          },
+          }),
         });
 
         assert.deepEqual(page1[0], mary.agentPubKey);
@@ -400,41 +400,41 @@ test(
         const page2: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_followers_for_creator",
-          payload: {
+          payload: wrapInput({
             creator: alice.agentPubKey,
             page: {
               after_agentpubkey: page1[1],
               limit: 2,
             },
-          },
+          }),
         });
         assert.deepEqual(page2[0], john.agentPubKey);
         assert.deepEqual(page2[1], carol.agentPubKey);
 
         const page3: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_followers_for_creator",
-          payload: {
+          payload: wrapInput({
             creator: alice.agentPubKey,
             page: {
               after_agentpubkey: page2[1],
               limit: 2,
             },
-          },
+          }),
         });
         assert.lengthOf(page3, 1);
         assert.deepEqual(page3[0], bob.agentPubKey);
 
         const page5: AgentPubKey[] = await alice.cells[0].callZome({
           zome_name: "follows",
           fn_name: "get_followers_for_creator",
-          payload: {
+          payload: wrapInput({
             creator: alice.agentPubKey,
             page: {
               after_agentpubkey: page3[0],
               limit: 2,
             },
-          },
+          }),
         });
         assert.lengthOf(page5, 0);
       },

tests/src/mewsfeed/likes/liker-to-hashes.test.ts

@@ -1,7 +1,7 @@
 import { assert, expect, test } from "vitest";
 import { runScenario, dhtSync } from "@holochain/tryorama";
 import { Record, fakeActionHash } from "@holochain/client";
-import { mewsfeedAppBundleSource } from "../../common";
+import { mewsfeedAppBundleSource, wrapInput } from "../../common";
 
 test("link a Liker to a Hash", async () => {
   await runScenario(
@@ -23,7 +23,7 @@ test("link a Liker to a Hash", async () => {
       let linksOutput: Record[] = await bob.cells[0].callZome({
         zome_name: "likes",
         fn_name: "get_hashes_for_liker",
-        payload: baseAddress,
+        payload: wrapInput(baseAddress),
       });
       assert.equal(linksOutput.length, 0);
 
@@ -43,15 +43,15 @@ test("link a Liker to a Hash", async () => {
       linksOutput = await bob.cells[0].callZome({
         zome_name: "likes",
         fn_name: "get_hashes_for_liker",
-        payload: baseAddress,
+        payload: wrapInput(baseAddress),
       });
       assert.equal(linksOutput.length, 1);
 
       // Bob gets the links in the inverse direction
       linksOutput = await bob.cells[0].callZome({
         zome_name: "likes",
         fn_name: "get_likers_for_hash",
-        payload: targetAddress,
+        payload: wrapInput(targetAddress),
       });
       assert.equal(linksOutput.length, 1);
 
@@ -70,15 +70,15 @@ test("link a Liker to a Hash", async () => {
       linksOutput = await bob.cells[0].callZome({
         zome_name: "likes",
         fn_name: "get_hashes_for_liker",
-        payload: baseAddress,
+        payload: wrapInput(baseAddress),
       });
       assert.equal(linksOutput.length, 0);
 
       // Bob gets the links in the inverse direction
       linksOutput = await bob.cells[0].callZome({
         zome_name: "likes",
         fn_name: "get_likers_for_hash",
-        payload: targetAddress,
+        payload: wrapInput(targetAddress),
       });
       assert.equal(linksOutput.length, 0);
     },