From 8c66401e2aa8c8ed6c7ad65331a7907aae0cb98e Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Mon, 21 Jun 2021 19:21:12 -0700 Subject: [PATCH] chore(zoe): stop using install-metering-and-ses The tests that actually need to exercise metering now use `xs-worker` instead of enabling global metering. This speeds those tests up by 4x-6x. refs #3373 --- packages/zoe/package.json | 1 - .../swingsetTests/brokenContracts/test-crashingContract.js | 3 ++- packages/zoe/test/swingsetTests/makeKind/test-makeKind.js | 2 +- .../zoe/test/swingsetTests/zoe-metering/test-zoe-metering.js | 3 ++- packages/zoe/test/swingsetTests/zoe/test-zoe.js | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/zoe/package.json b/packages/zoe/package.json index bee11bbb249..c02bab24b2f 100644 --- a/packages/zoe/package.json +++ b/packages/zoe/package.json @@ -58,7 +58,6 @@ }, "devDependencies": { "@agoric/babel-standalone": "^7.14.3", - "@agoric/install-metering-and-ses": "^0.2.15", "@agoric/install-ses": "^0.5.15", "ava": "^3.12.1", "esm": "agoric-labs/esm#Agoric-built", diff --git a/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js b/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js index 896932b3501..53cdea3dc7e 100644 --- a/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js +++ b/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js @@ -5,7 +5,7 @@ // https://github.com/endojs/endo/issues/768 import '@agoric/babel-standalone'; // eslint-disable-next-line import/no-extraneous-dependencies -import '@agoric/install-metering-and-ses'; +import '@agoric/install-ses'; // eslint-disable-next-line import/no-extraneous-dependencies import test from 'ava'; @@ -28,6 +28,7 @@ const generateBundlesP = Promise.all( async function main(argv) { const config = await loadBasedir(__dirname); + config.defaultManagerType = 'xs-worker'; await generateBundlesP; const controller = await buildVatController(config, argv); await controller.run(); diff --git a/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js b/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js index 7e8da85a077..6b049dc388b 100644 --- a/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js +++ b/packages/zoe/test/swingsetTests/makeKind/test-makeKind.js @@ -4,7 +4,7 @@ // https://github.com/endojs/endo/issues/768 import '@agoric/babel-standalone'; // eslint-disable-next-line import/no-extraneous-dependencies -import '@agoric/install-metering-and-ses'; +import '@agoric/install-ses'; // eslint-disable-next-line import/no-extraneous-dependencies import test from 'ava'; // eslint-disable-next-line import/no-extraneous-dependencies diff --git a/packages/zoe/test/swingsetTests/zoe-metering/test-zoe-metering.js b/packages/zoe/test/swingsetTests/zoe-metering/test-zoe-metering.js index 22fd739a523..e0fe6d32d5d 100644 --- a/packages/zoe/test/swingsetTests/zoe-metering/test-zoe-metering.js +++ b/packages/zoe/test/swingsetTests/zoe-metering/test-zoe-metering.js @@ -4,7 +4,7 @@ // https://github.com/endojs/endo/issues/768 import '@agoric/babel-standalone'; // eslint-disable-next-line import/no-extraneous-dependencies -import '@agoric/install-metering-and-ses'; +import '@agoric/install-ses'; // eslint-disable-next-line import/no-extraneous-dependencies import test from 'ava'; import { loadBasedir, buildVatController } from '@agoric/swingset-vat'; @@ -33,6 +33,7 @@ const generateBundlesP = Promise.all( async function main(argv) { const config = await loadBasedir(__dirname); + config.defaultManagerType = 'xs-worker'; await generateBundlesP; const controller = await buildVatController(config, argv); await controller.run(); diff --git a/packages/zoe/test/swingsetTests/zoe/test-zoe.js b/packages/zoe/test/swingsetTests/zoe/test-zoe.js index 1ea8fcc38b2..4ac0f08e78e 100644 --- a/packages/zoe/test/swingsetTests/zoe/test-zoe.js +++ b/packages/zoe/test/swingsetTests/zoe/test-zoe.js @@ -6,7 +6,7 @@ // https://github.com/endojs/endo/issues/768 import '@agoric/babel-standalone'; // eslint-disable-next-line import/no-extraneous-dependencies -import '@agoric/install-metering-and-ses'; +import '@agoric/install-ses'; // eslint-disable-next-line import/no-extraneous-dependencies import test from 'ava'; import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';