From 1ed02ba45c2c37be6cb7b0c048895364b6798d71 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Thu, 20 Jun 2024 18:29:53 -0700
Subject: [PATCH] feat!: export heapVowTools

---
 packages/vow/test/vat.test.js | 4 +++-
 packages/vow/vat.js           | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/vow/test/vat.test.js b/packages/vow/test/vat.test.js
index bbb04e0452b0..5efccafe5b50 100644
--- a/packages/vow/test/vat.test.js
+++ b/packages/vow/test/vat.test.js
@@ -2,7 +2,9 @@
 import test from 'ava';
 import { E, Far } from '@endo/far';
 
-import { V, makeVowKit } from '../vat.js';
+import { V, heapVowTools } from '../vat.js';
+
+const { makeVowKit } = heapVowTools;
 
 test('heap messages', async t => {
   const greeter = Far('Greeter', {
diff --git a/packages/vow/vat.js b/packages/vow/vat.js
index 27b7e09a031f..a5f429f5c967 100644
--- a/packages/vow/vat.js
+++ b/packages/vow/vat.js
@@ -26,8 +26,7 @@ export const defaultPowers = harden({
 export const prepareVowTools = (zone, powers = {}) =>
   rawPrepareVowTools(zone, { ...defaultPowers, ...powers });
 
-export const vowTools = prepareVowTools(makeHeapZone());
-export const { watch, when, makeVowKit, allVows } = vowTools;
+export const heapVowTools = prepareVowTools(makeHeapZone());
 
 /**
  * A vow-shortening E.  CAVEAT: This produces long-lived ephemeral
@@ -36,6 +35,6 @@ export const { watch, when, makeVowKit, allVows } = vowTools;
  * you need to `watch` its resulting promises.
  */
 export const V = makeE(globalThis.HandledPromise, {
-  unwrap: when,
-  additional: { when },
+  unwrap: heapVowTools.when,
+  additional: { when: heapVowTools.when },
 });