fix: orchestrate() returns Vow

Agoric · Jul 12, 2024 · 8388f36 · 8388f36
1 parent d7948c7
commit 8388f36
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/packages/orchestration/src/facade.js b/packages/orchestration/src/facade.js
@@ -52,8 +52,6 @@ export const makeOrchestrationFacade = ({
 
   const { prepareEndowment, asyncFlow, adminAsyncFlow } = asyncFlowTools;
 
-  const { when } = vowTools;
-
   /**
    * @template RT - return type
    * @template HC - host context
@@ -66,7 +64,7 @@ export const makeOrchestrationFacade = ({
    *   guestCtx: GuestInterface<HC>,
    *   ...args: GA
    * ) => Promise<RT>} guestFn
-   * @returns {(...args: HostArgs<GA>) => Promise<RT>}
+   * @returns {(...args: HostArgs<GA>) => Vow<RT>}
    */
   const orchestrate = (durableName, hostCtx, guestFn) => {
     const subZone = zone.subZone(durableName);
@@ -81,10 +79,8 @@ export const makeOrchestrationFacade = ({
     const hostFn = asyncFlow(subZone, 'asyncFlow', guestFn);
 
     const orcFn = (...args) =>
-      // TODO remove the `when` after fixing the return type
-      // to `Vow<HostReturn>`
       // @ts-expect-error cast
-      when(hostFn(wrappedOrc, wrappedCtx, ...args));
+      hostFn(wrappedOrc, wrappedCtx, ...args);
 
     // @ts-expect-error cast
     return harden(orcFn);

diff --git a/packages/orchestration/test/examples/basic-flows.contract.test.ts b/packages/orchestration/test/examples/basic-flows.contract.test.ts
@@ -61,12 +61,17 @@ const orchestrationAccountScenario = test.macro({
       return t.fail(`Unknown chain: ${chainName}`);
     }
 
-    const { zoe, instance } = t.context;
+    const {
+      bootstrap: { vowTools: vt },
+      zoe,
+      instance,
+    } = t.context;
     const publicFacet = await E(zoe).getPublicFacet(instance);
     const inv = E(publicFacet).makeOrchAccountInvitation();
     const userSeat = E(zoe).offer(inv, {}, undefined, { chainName });
-    const { invitationMakers, publicSubscribers } =
-      await E(userSeat).getOfferResult();
+    const { invitationMakers, publicSubscribers } = await vt.when(
+      E(userSeat).getOfferResult(),
+    );
 
     t.regex(getInterfaceOf(invitationMakers)!, /invitationMakers/);
 

diff --git a/packages/orchestration/test/examples/sendAnywhere.test.ts b/packages/orchestration/test/examples/sendAnywhere.test.ts
@@ -60,6 +60,7 @@ test('send using arbitrary chain info', async t => {
     brands: { ist },
     utils: { inspectLocalBridge, pourPayment },
   } = await commonSetup(t);
+  const vt = bootstrap.vowTools;
 
   const { zoe, bundleAndInstall } = await setUpZoeForTest();
 
@@ -121,7 +122,7 @@ test('send using arbitrary chain info', async t => {
       { Send },
       { destAddr: 'hot1destAddr', chainName },
     );
-    await E(userSeat).getOfferResult();
+    await vt.when(E(userSeat).getOfferResult());
 
     const history = inspectLocalBridge();
     t.like(history, [
@@ -154,7 +155,7 @@ test('send using arbitrary chain info', async t => {
       { Send },
       { destAddr: 'cosmos1destAddr', chainName: 'cosmoshub' },
     );
-    await E(userSeat).getOfferResult();
+    await vt.when(E(userSeat).getOfferResult());
     const history = inspectLocalBridge();
     const { messages, address: execAddr } = history.at(-1);
     t.is(messages.length, 1);
@@ -200,7 +201,7 @@ test('send using arbitrary chain info', async t => {
       { Send },
       { destAddr: 'hot1destAddr', chainName: 'hot' },
     );
-    await E(userSeat).getOfferResult();
+    await vt.when(E(userSeat).getOfferResult());
     const history = inspectLocalBridge();
     const { messages, address: execAddr } = history.at(-1);
     t.is(messages.length, 1);

diff --git a/packages/orchestration/test/examples/swapExample.test.ts b/packages/orchestration/test/examples/swapExample.test.ts
@@ -68,7 +68,8 @@ test.skip('start', async t => {
       } as const,
     },
   );
-  const result = await E(userSeat).getOfferResult();
+  const vt = bootstrap.vowTools;
+  const result = await vt.when(E(userSeat).getOfferResult());
   t.is(result, undefined);
 
   // bank purse now has the 10 IST

diff --git a/packages/orchestration/test/examples/unbondExample.test.ts b/packages/orchestration/test/examples/unbondExample.test.ts
@@ -14,6 +14,7 @@ type StartFn =
 
 test('start', async t => {
   const {
+    bootstrap: { vowTools: vt },
     brands: { ist },
     commonPrivateArgs,
   } = await commonSetup(t);
@@ -47,7 +48,7 @@ test('start', async t => {
     {},
     { validator: 'agoric1valopsfufu' },
   );
-  const result = await E(userSeat).getOfferResult();
+  const result = await vt.when(E(userSeat).getOfferResult());
   t.is(result, undefined);
 
   const tree = inspectMapStore(contractBaggage);

diff --git a/packages/orchestration/test/facade.test.ts b/packages/orchestration/test/facade.test.ts
@@ -76,7 +76,7 @@ test.serial('chain info', async t => {
     return orc.getChain('mock');
   });
 
-  const result = (await handle()) as Chain<any>;
+  const result = (await vt.when(handle())) as Chain<any>;
   t.deepEqual(await vt.when(result.getChainInfo()), mockChainInfo);
 });
 
@@ -122,7 +122,7 @@ test.serial('faulty chain info', async t => {
     return account;
   });
 
-  await t.throwsAsync(handle(), {
+  await t.throwsAsync(vt.when(handle()), {
     message: 'chain info lacks staking denom',
   });
 });