diff --git a/packages/SwingSet/src/kernel/loadVat.js b/packages/SwingSet/src/kernel/loadVat.js index 37f68de8751..09daff61b42 100644 --- a/packages/SwingSet/src/kernel/loadVat.js +++ b/packages/SwingSet/src/kernel/loadVat.js @@ -138,7 +138,7 @@ export function makeVatLoader(stuff) { * the amount of computation and allocation that can occur during any * given crank. Stack frames are limited as well. The meter is refilled * between cranks, but if the meter ever underflows, the vat is - * terminated. If false, the vat is unmetered. Defaults to true for + * terminated. If false, the vat is unmetered. Defaults to false for * dynamic vats; static vats may not be metered. * * @param {Record} [options.vatParameters] provides @@ -199,7 +199,7 @@ export function makeVatLoader(stuff) { isDynamic ? allowedDynamicOptions : allowedStaticOptions, ); const { - metered = isDynamic, + metered = false, vatParameters = {}, managerType, enableSetup = false, diff --git a/packages/SwingSet/test/metering/test-dynamic-vat-metered.js b/packages/SwingSet/test/metering/test-dynamic-vat-metered.js index 0496f84fa05..a33fd975910 100644 --- a/packages/SwingSet/test/metering/test-dynamic-vat-metered.js +++ b/packages/SwingSet/test/metering/test-dynamic-vat-metered.js @@ -57,11 +57,9 @@ async function runOneTest(t, explosion, managerType) { await c.run(); // 'createVat' will import the bundle - c.queueToVatRoot( - 'bootstrap', - 'createVat', - capargs([dynamicVatBundle, { managerType }]), - ); + const cvopts = { managerType, metered: true }; + const cvargs = capargs([dynamicVatBundle, cvopts]); + c.queueToVatRoot('bootstrap', 'createVat', cvargs); await c.run(); t.deepEqual(nextLog(), ['created'], 'first create'); diff --git a/packages/SwingSet/test/metering/test-dynamic-vat-subcompartment.js b/packages/SwingSet/test/metering/test-dynamic-vat-subcompartment.js index 0dc345c5c7a..74830b61357 100644 --- a/packages/SwingSet/test/metering/test-dynamic-vat-subcompartment.js +++ b/packages/SwingSet/test/metering/test-dynamic-vat-subcompartment.js @@ -43,7 +43,9 @@ test('metering dynamic vat which imports bundle', async t => { ); // 'createVat' will import the bundle - c.queueToVatRoot('bootstrap', 'createVat', capargs([dynamicVatBundle])); + const cvopts = { metered: true }; + const cvargs = capargs([dynamicVatBundle, cvopts]); + c.queueToVatRoot('bootstrap', 'createVat', cvargs); await c.run(); t.deepEqual(nextLog(), ['created'], 'first create');