From 905bf514b64660e92d4750e2a24ae49e895011fc Mon Sep 17 00:00:00 2001
From: "Mark S. Miller" <erights@gmail.com>
Date: Sat, 5 Aug 2023 13:50:54 -0700
Subject: [PATCH] fix: review suggestions

---
 packages/exo/src/exo-makers.js                | 43 +++++--------------
 packages/exo/test/test-revoke-heap-classes.js |  6 ++-
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/packages/exo/src/exo-makers.js b/packages/exo/src/exo-makers.js
index 0cac88f893..fccb922db8 100644
--- a/packages/exo/src/exo-makers.js
+++ b/packages/exo/src/exo-makers.js
@@ -5,8 +5,7 @@ import { objectMap } from '@endo/patterns';
 
 import { defendPrototype, defendPrototypeKit } from './exo-tools.js';
 
-const { Fail, quote: q } = assert;
-const { create, seal, freeze, defineProperty, entries, values } = Object;
+const { create, seal, freeze, defineProperty, values } = Object;
 
 const { getEnvironmentOption } = makeEnvironmentCaptor(globalThis);
 const DEBUG = getEnvironmentOption('DEBUG', '');
@@ -70,7 +69,7 @@ export const initEmpty = () => emptyRecord;
  */
 
 /**
- * @callback GetRevoker
+ * @callback ReceiveRevoker
  * @param {Revoker} revoke
  * @returns {void}
  */
@@ -80,7 +79,7 @@ export const initEmpty = () => emptyRecord;
  * @typedef {object} FarClassOptions
  * @property {(context: C) => void} [finish]
  * @property {StateShape} [stateShape]
- * @property {GetRevoker} [getRevoker]
+ * @property {ReceiveRevoker} [receiveRevoker]
  */
 
 /**
@@ -101,7 +100,7 @@ export const defineExoClass = (
   options = {},
 ) => {
   harden(methods);
-  const { finish = undefined, getRevoker = undefined } = options;
+  const { finish = undefined, receiveRevoker = undefined } = options;
   /** @type {WeakMap<M,ClassContext<ReturnType<I>, M>>} */
   const contextMap = new WeakMap();
   const proto = defendPrototype(
@@ -134,10 +133,10 @@ export const defineExoClass = (
     );
   };
 
-  if (getRevoker) {
+  if (receiveRevoker) {
     const revoke = self => contextMap.delete(self);
     harden(revoke);
-    getRevoker(revoke);
+    receiveRevoker(revoke);
   }
 
   return harden(makeInstance);
@@ -162,7 +161,7 @@ export const defineExoClassKit = (
   options = {},
 ) => {
   harden(methodsKit);
-  const { finish = undefined, getRevoker = undefined } = options;
+  const { finish = undefined, receiveRevoker = undefined } = options;
   const contextMapKit = objectMap(methodsKit, () => new WeakMap());
   const getContextKit = objectMap(
     contextMapKit,
@@ -200,31 +199,11 @@ export const defineExoClassKit = (
     return context.facets;
   };
 
-  if (getRevoker) {
-    const revoke = aFacet => {
-      let seenTrue = false;
-      let facets;
-      for (const contextMap of values(contextMapKit)) {
-        if (contextMap.has(aFacet)) {
-          seenTrue = true;
-          facets = contextMap.get(aFacet).facets;
-          break;
-        }
-      }
-      if (!seenTrue) {
-        return false;
-      }
-      // eslint-disable-next-line no-use-before-define
-      for (const [facetName, facet] of entries(facets)) {
-        const seen = contextMapKit[facetName].delete(facet);
-        if (seen === false) {
-          Fail`internal: inconsistent facet revocation ${q(facetName)}`;
-        }
-      }
-      return seenTrue;
-    };
+  if (receiveRevoker) {
+    const revoke = aFacet =>
+      values(contextMapKit).some(contextMap => contextMap.delete(aFacet));
     harden(revoke);
-    getRevoker(revoke);
+    receiveRevoker(revoke);
   }
 
   return harden(makeInstanceKit);
diff --git a/packages/exo/test/test-revoke-heap-classes.js b/packages/exo/test/test-revoke-heap-classes.js
index 1c2e16dab4..5f2c81c581 100644
--- a/packages/exo/test/test-revoke-heap-classes.js
+++ b/packages/exo/test/test-revoke-heap-classes.js
@@ -36,7 +36,7 @@ test('test revoke defineExoClass', t => {
       },
     },
     {
-      getRevoker(r) {
+      receiveRevoker(r) {
         revoke = r;
       },
     },
@@ -74,7 +74,7 @@ test('test revoke defineExoClassKit', t => {
       },
     },
     {
-      getRevoker(r) {
+      receiveRevoker(r) {
         revoke = r;
       },
     },
@@ -83,10 +83,12 @@ test('test revoke defineExoClassKit', t => {
   t.is(upCounter.incr(5), 8);
   t.is(downCounter.decr(), 7);
   t.is(revoke(upCounter), true);
+  t.is(revoke(upCounter), false);
   t.throws(() => upCounter.incr(3), {
     message:
       '"In \\"incr\\" method of (Counter up)" may only be applied to a valid instance: "[Alleged: Counter up]"',
   });
+  t.is(revoke(downCounter), true);
   t.is(revoke(downCounter), false);
   t.throws(() => downCounter.decr(), {
     message: