fix(base-zone,zone): import isPassable from @endo/pass-style

Agoric · Apr 28, 2024 · b4c97b6 · b4c97b6
1 parent b8140f3
commit b4c97b6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 38 deletions.
diff --git a/packages/base-zone/src/heap.js b/packages/base-zone/src/heap.js
@@ -1,7 +1,7 @@
 // @ts-check
 // @jessie-check
 
-import { Far } from '@endo/far';
+import { Far, isPassable } from '@endo/pass-style';
 import { makeExo, defineExoClass, defineExoClassKit } from '@endo/exo';
 import {
   makeScalarMapStore,
@@ -12,7 +12,6 @@ import {
 
 import { makeOnceKit } from './make-once.js';
 import { agoricVatDataKeys as keys } from './keys.js';
-import { isPassable } from './is-passable.js';
 
 /**
  * @type {import('./types.js').Stores}

diff --git a/packages/base-zone/src/index.js b/packages/base-zone/src/index.js
@@ -6,4 +6,3 @@ export * from './exports.js';
 // Utilities for creating zones.
 export * from './make-once.js';
 export * from './keys.js';
-export * from './is-passable.js';
diff --git a/packages/base-zone/src/is-passable.js b/packages/base-zone/src/is-passable.js
diff --git a/packages/zone/src/durable.js b/packages/zone/src/durable.js
@@ -1,7 +1,7 @@
 // @ts-check
 // @jessie-check
 
-import { Far } from '@endo/far';
+import { Far, isPassable } from '@endo/pass-style';
 import {
   canBeDurable,
   makeScalarMapStore,
@@ -14,11 +14,7 @@ import {
   provideDurableWeakSetStore,
 } from '@agoric/vat-data';
 
-import {
-  agoricVatDataKeys as keys,
-  isPassable,
-  makeOnceKit,
-} from '@agoric/base-zone';
+import { agoricVatDataKeys as keys, makeOnceKit } from '@agoric/base-zone';
 
 const { Fail } = assert;
 

diff --git a/packages/zone/src/virtual.js b/packages/zone/src/virtual.js
@@ -1,7 +1,7 @@
 // @ts-check
 // @jessie-check
 
-import { Far } from '@endo/far';
+import { Far, isPassable } from '@endo/pass-style';
 import {
   defineVirtualExoClass,
   defineVirtualExoClassKit,
@@ -11,11 +11,7 @@ import {
   makeScalarBigWeakSetStore,
 } from '@agoric/vat-data';
 
-import {
-  agoricVatDataKeys as keys,
-  isPassable,
-  makeOnceKit,
-} from '@agoric/base-zone';
+import { agoricVatDataKeys as keys, makeOnceKit } from '@agoric/base-zone';
 
 const emptyRecord = harden({});
 const initEmpty = harden(() => emptyRecord);