fix: getPublicFacet accepts promise for instance (#4328)

* fix: getPublicFacet accepts promise for instance * fix: add test
Agoric · Jan 21, 2022 · f716199 · f716199
1 parent 8a6875f
commit f716199
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/packages/zoe/src/zoeService/instanceAdminStorage.js b/packages/zoe/src/zoeService/instanceAdminStorage.js
@@ -1,5 +1,6 @@
 // @ts-check
 
+import { E } from '@agoric/eventual-send';
 import { makeWeakStore } from '@agoric/store';
 
 /**
@@ -10,9 +11,10 @@ export const makeInstanceAdminStorage = () => {
   const instanceToInstanceAdmin = makeWeakStore('instance');
 
   /** @type {GetPublicFacet} */
-  const getPublicFacet = async instance => {
-    return instanceToInstanceAdmin.get(instance).getPublicFacet();
-  };
+  const getPublicFacet = async instanceP =>
+    E.when(instanceP, instance =>
+      instanceToInstanceAdmin.get(instance).getPublicFacet(),
+    );
 
   /** @type {GetBrands} */
   const getBrands = async instance =>

diff --git a/packages/zoe/src/zoeService/types.js b/packages/zoe/src/zoeService/types.js
@@ -66,7 +66,7 @@
 
 /**
  * @callback GetPublicFacet
- * @param {Instance} instance
+ * @param {ERef<Instance>} instanceP
  * @returns {Promise<Object>}
  */
 

diff --git a/packages/zoe/test/unitTests/test-zoe.js b/packages/zoe/test/unitTests/test-zoe.js
@@ -195,6 +195,26 @@ test(`E(zoe).getPublicFacet`, async t => {
   t.is(await E(zoe).getPublicFacet(instance), publicFacet);
 });
 
+test(`E(zoe).getPublicFacet promise for instance`, async t => {
+  const { zoe } = setup();
+  const contractPath = `${dirname}/../../src/contracts/automaticRefund`;
+  const bundle = await bundleSource(contractPath);
+  const installationP = E(zoe).install(bundle);
+  // Note that E.get does not currently pipeline
+  const { publicFacet: publicFacetP, instance: instanceP } = E.get(
+    E(zoe).startInstance(installationP),
+  );
+  const pfp = E(zoe).getPublicFacet(instanceP);
+  const offersCountP = E(publicFacetP).getOffersCount();
+  const [offersCount, publicFacet, pf] = await Promise.all([
+    offersCountP,
+    publicFacetP,
+    pfp,
+  ]);
+  t.is(offersCount, 0n);
+  t.is(pf, publicFacet);
+});
+
 test(`E(zoe).getPublicFacet - no instance`, async t => {
   const { zoe } = setup();
   // @ts-ignore deliberate invalid arguments for testing