chore(types): watchPromise

Agoric · Nov 9, 2023 · d9994a3 · d9994a3
1 parent 5707827
commit d9994a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/packages/swingset-liveslots/src/vatDataTypes.d.ts b/packages/swingset-liveslots/src/vatDataTypes.d.ts
@@ -13,6 +13,7 @@ import type {
   WeakMapStore,
   WeakSetStore,
 } from '@agoric/store';
+import type { makeWatchedPromiseManager } from './watchedPromises.js';
 
 // TODO should be moved into @endo/patterns and eventually imported here
 // instead of this local definition.
@@ -25,6 +26,8 @@ export type { MapStore, Pattern };
 // onerous.
 export type Baggage = MapStore<string, any>;
 
+type WatchedPromisesManager = ReturnType<typeof makeWatchedPromiseManager>;
+
 type Tail<T extends any[]> = T extends [head: any, ...rest: infer Rest]
   ? Rest
   : [];
@@ -169,8 +172,8 @@ export type VatData = {
     options?: DefineKindOptions<MultiKindContext<S, B>>,
   ) => (...args: P) => KindFacets<B>;
 
-  providePromiseWatcher: unknown;
-  watchPromise: unknown;
+  providePromiseWatcher: WatchedPromisesManager['providePromiseWatcher'];
+  watchPromise: WatchedPromisesManager['watchPromise'];
 
   makeScalarBigMapStore: <K, V>(
     label: string,

diff --git a/packages/swingset-liveslots/src/watchedPromises.js b/packages/swingset-liveslots/src/watchedPromises.js
@@ -147,6 +147,12 @@ export function makeWatchedPromiseManager({
     }
   }
 
+  /**
+   *
+   * @param {Promise} p
+   * @param {{onFulfilled?: Function, onRejected?: Function}} watcher
+   * @param  {...any} args
+   */
   function watchPromise(p, watcher, ...args) {
     // The following wrapping defers setting up the promise watcher itself to a
     // later turn so that if the promise to be watched was the return value from

diff --git a/packages/swingset-liveslots/tools/setup-vat-data.js b/packages/swingset-liveslots/tools/setup-vat-data.js
@@ -20,7 +20,8 @@ globalThis.VatData = harden({
   canBeDurable: (...args) => fakeVomKit.vom.canBeDurable(...args),
   providePromiseWatcher: (...args) =>
     fakeVomKit.wpm.providePromiseWatcher(...args),
-  watchPromise: (...args) => fakeVomKit.wpm.watchPromise(...args),
+  watchPromise: (p, watcher, ...args) =>
+    fakeVomKit.wpm.watchPromise(p, watcher, ...args),
   makeScalarBigMapStore: (...args) =>
     fakeVomKit.cm.makeScalarBigMapStore(...args),
   makeScalarBigWeakMapStore: (...args) =>

diff --git a/packages/zoe/src/zoeService/startInstance.js b/packages/zoe/src/zoeService/startInstance.js
@@ -1,5 +1,3 @@
-/* global globalThis */
-
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E } from '@endo/eventual-send';
 import { passStyleOf } from '@endo/marshal';
@@ -9,6 +7,7 @@ import {
   provideDurableWeakMapStore,
   prepareExoClass,
   prepareExo,
+  watchPromise,
 } from '@agoric/vat-data';
 import { initEmpty } from '@agoric/store';
 import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
@@ -92,12 +91,7 @@ export const makeStartInstance = (
   );
 
   const watchForAdminNodeDone = (adminNode, instAdmin) => {
-    globalThis.VatData.watchPromise(
-      E(adminNode).done(),
-      watcher,
-      instAdmin,
-      adminNode,
-    );
+    watchPromise(E(adminNode).done(), watcher, instAdmin, adminNode);
   };
 
   const makeZoeInstanceAdmin = prepareExoClass(