refactor(zoe,base-zone): move prepare-revocable to base-zone helper l…

…ib (#8965) * refactor(zoe,base-zone): move prepare-revocable to base-zone helper lib * fixup! deprecation notice
Agoric · Feb 24, 2024 · e5ee0b4 · e5ee0b4
1 parent be6d970
commit e5ee0b4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/packages/base-zone/package.json b/packages/base-zone/package.json
@@ -19,6 +19,7 @@
   },
   "exports": {
     ".": "./src/index.js",
+    "./zone-helpers.js": "./zone-helpers.js",
     "./heap.js": "./heap.js",
     "./tools/*": "./tools/*"
   },
@@ -27,13 +28,15 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agoric/store": "^0.9.2",
+    "@endo/common": "^1.1.0",
     "@endo/exo": "^1.2.1",
     "@endo/far": "^1.0.4",
     "@endo/pass-style": "^1.2.0",
     "@endo/patterns": "^1.2.0"
   },
   "devDependencies": {
     "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
     "ava": "^5.3.0"
   },
   "publishConfig": {

diff --git a/.../src/contractSupport/prepare-revocable.js → packages/base-zone/src/prepare-revocable.js b/.../src/contractSupport/prepare-revocable.js → packages/base-zone/src/prepare-revocable.js
@@ -46,8 +46,9 @@ const { Fail, quote: q } = assert;
 
 /**
  * Make an exo class kit for wrapping an underlying exo class,
- * where the wrapper is a revocable forwarder
+ * where the wrapper is a revocable forwarder.
  *
+ * @deprecated Change to `prepareRevocableMakerKit` once #8977 happens
  * @template {any} [U=any]
  * @param {import('@agoric/base-zone').Zone} zone
  * @param {string} uKindName

diff --git a/packages/base-zone/test/prepare-test-env-ava.js b/packages/base-zone/test/prepare-test-env-ava.js
@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
+import { wrapTest } from '@endo/ses-ava';
+import rawTest from 'ava';
 
-import test from 'ava';
-
-export { test };
+export const test = wrapTest(rawTest);
diff --git a/...contractSupport/test-prepare-revocable.js → .../base-zone/test/test-prepare-revocable.js b/...contractSupport/test-prepare-revocable.js → .../base-zone/test/test-prepare-revocable.js
@@ -1,11 +1,11 @@
 // Modeled on test-heap-classes.js
 
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava.js';
 
 // eslint-disable-next-line import/order
 import { M } from '@endo/patterns';
-import { makeHeapZone } from '@agoric/base-zone/heap.js';
-import { prepareRevocableKit } from '../../../src/contractSupport/prepare-revocable.js';
+import { makeHeapZone } from '../src/heap.js';
+import { prepareRevocableKit } from '../src/prepare-revocable.js';
 
 const UpCounterI = M.interface('UpCounter', {
   incr: M.call()

diff --git a/packages/base-zone/zone-helpers.js b/packages/base-zone/zone-helpers.js
@@ -0,0 +1 @@
+export * from './src/prepare-revocable.js';
diff --git a/packages/zoe/src/contractSupport/index.js b/packages/zoe/src/contractSupport/index.js
@@ -55,7 +55,6 @@ export {
 
 export * from './durability.js';
 export * from './prepare-ownable.js';
-export * from './prepare-revocable.js';
 export * from './priceAuthority.js';
 export * from './priceQuote.js';
 export * from './statistics.js';

diff --git a/packages/zoe/src/contractSupport/prepare-ownable.js b/packages/zoe/src/contractSupport/prepare-ownable.js
@@ -1,6 +1,6 @@
 import { M } from '@endo/patterns';
+import { prepareRevocableKit } from '@agoric/base-zone/zone-helpers.js';
 import { OfferHandlerI } from '../typeGuards.js';
-import { prepareRevocableKit } from './prepare-revocable.js';
 
 const TransferProposalShape = M.splitRecord({
   give: {},