From d7135b25a609661c485e8bbdea9c0ea5b784346b Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Fri, 7 Jun 2024 09:45:34 +0000
Subject: [PATCH] test: switch vow test to run under xs for metering

---
 packages/SwingSet/tools/bootstrap-relay.js        | 9 ++++++---
 packages/boot/test/upgrading/upgrade-vats.test.js | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/SwingSet/tools/bootstrap-relay.js b/packages/SwingSet/tools/bootstrap-relay.js
index f054f567ae5..a1182e5fbbb 100644
--- a/packages/SwingSet/tools/bootstrap-relay.js
+++ b/packages/SwingSet/tools/bootstrap-relay.js
@@ -37,10 +37,13 @@ export const buildRootObject = () => {
       return root;
     },
 
-    createVat: async ({ name, bundleCapName, vatParameters = {} }) => {
+    createVat: async (
+      { name, bundleCapName, vatParameters = {} },
+      options = {},
+    ) => {
       const bcap = await E(vatAdmin).getNamedBundleCap(bundleCapName);
-      const options = { vatParameters };
-      const { adminNode, root } = await E(vatAdmin).createVat(bcap, options);
+      const vatOptions = { ...options, vatParameters };
+      const { adminNode, root } = await E(vatAdmin).createVat(bcap, vatOptions);
       vatData.set(name, { adminNode, root });
       return root;
     },
diff --git a/packages/boot/test/upgrading/upgrade-vats.test.js b/packages/boot/test/upgrading/upgrade-vats.test.js
index 2d049e1c756..b3543b9332f 100644
--- a/packages/boot/test/upgrading/upgrade-vats.test.js
+++ b/packages/boot/test/upgrading/upgrade-vats.test.js
@@ -456,12 +456,15 @@ test('upgrade vat-vow', async t => {
 
   const { EV } = await makeScenario(t, { bundles });
 
-  t.log('create initial version');
+  t.log('create initial version, metered');
+  const vatAdmin = await EV.vat('bootstrap').getVatAdmin();
+  const meter = await EV(vatAdmin).createUnlimitedMeter();
   const vowVatConfig = {
     name: 'vow',
     bundleCapName: 'vow',
   };
-  const vowRoot = await EV.vat('bootstrap').createVat(vowVatConfig);
+  const vatOptions = { managerType: 'xs-worker', meter };
+  const vowRoot = await EV.vat('bootstrap').createVat(vowVatConfig, vatOptions);
 
   t.log('test incarnation 0');
   /** @type {Record<string, [settlementValue?: unknown, isRejection?: boolean]>} */