Merge pull request #204 from holochain/restore-zome-call-by-role-name

Restore zome call by role name instead of cell id

CHANGELOG.md

@@ -9,6 +9,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 ### Fixed
 
+## 2024-04-29: v0.16.0-dev.6
+### Fixed
+- Restored the ability to make a zome call on the app websocket using a role name instead of a cell id.
+
 ## 2024-04-27: v0.16.0-dev.5
 ### Changed
 - Update the version of the JS client to v0.17.0-dev.12.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@holochain/tryorama",
   "description": "Toolset to manage Holochain conductors and facilitate running test scenarios",
-  "version": "0.16.0-dev.5",
+  "version": "0.16.0-dev.6",
   "author": "Holochain Foundation",
   "license": "MIT",
   "keywords": [

ts/src/local/conductor.ts

@@ -3,12 +3,11 @@ import {
   AppBundleSource,
   AppWebsocket,
   AttachAppInterfaceRequest,
-  CallZomeRequest,
-  CallZomeRequestSigned,
   encodeHashToBase64,
   getSigningCredentials,
   InstallAppRequest,
   AppAuthenticationToken,
+  AppCallZomeRequest,
 } from "@holochain/client";
 import getPort, { portNumbers } from "get-port";
 import pick from "lodash/pick.js";
@@ -317,12 +316,19 @@ export class Conductor implements IConductor {
 
     // set up automatic zome call signing
     const callZome = appWs.callZome.bind(appWs);
-    appWs.callZome = async (
-      req: CallZomeRequest | CallZomeRequestSigned,
-      timeout?: number
-    ) => {
-      if (!getSigningCredentials(req.cell_id)) {
-        await this.adminWs().authorizeSigningCredentials(req.cell_id);
+    appWs.callZome = async (req: AppCallZomeRequest, timeout?: number) => {
+      let cellId;
+      if ("role_name" in req) {
+        assert(appWs.cachedAppInfo);
+        cellId = appWs.getCellIdFromRoleName(
+          req.role_name,
+          appWs.cachedAppInfo
+        );
+      } else {
+        cellId = req.cell_id;
+      }
+      if (!getSigningCredentials(cellId)) {
+        await this.adminWs().authorizeSigningCredentials(cellId);
       }
       return callZome(req, timeout);
     };

ts/test/local/scenario.ts

@@ -1,4 +1,5 @@
 import {
+  ActionHash,
   AppBundleSource,
   AppSignal,
   AppSignalCb,
@@ -278,3 +279,20 @@ test("Local Scenario - pauseUntilDhtEqual - Create multiple entries, read the la
 
   await scenario.cleanUp();
 });
+
+test("Local Scenario - runScenario - call zome by role name", async (t) => {
+  await runScenario(async (scenario: Scenario) => {
+    const alice = await scenario.addPlayerWithApp({
+      path: FIXTURE_HAPP_URL.pathname,
+    });
+
+    const result = (await alice.appWs.callZome({
+      role_name: "test",
+      zome_name: "coordinator",
+      fn_name: "create",
+      payload: "hello",
+    })) as ActionHash;
+
+    t.ok(result);
+  });
+});