Skip to content

Commit 8c66401

Browse files
committed
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
1 parent d77c5fe commit 8c66401

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

packages/zoe/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
},
5959
"devDependencies": {
6060
"@agoric/babel-standalone": "^7.14.3",
61-
"@agoric/install-metering-and-ses": "^0.2.15",
6261
"@agoric/install-ses": "^0.5.15",
6362
"ava": "^3.12.1",
6463
"esm": "agoric-labs/esm#Agoric-built",

packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// https://github.com/endojs/endo/issues/768
66
import '@agoric/babel-standalone';
77
// eslint-disable-next-line import/no-extraneous-dependencies
8-
import '@agoric/install-metering-and-ses';
8+
import '@agoric/install-ses';
99
// eslint-disable-next-line import/no-extraneous-dependencies
1010
import test from 'ava';
1111

@@ -28,6 +28,7 @@ const generateBundlesP = Promise.all(
2828

2929
async function main(argv) {
3030
const config = await loadBasedir(__dirname);
31+
config.defaultManagerType = 'xs-worker';
3132
await generateBundlesP;
3233
const controller = await buildVatController(config, argv);
3334
await controller.run();

packages/zoe/test/swingsetTests/makeKind/test-makeKind.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// https://github.com/endojs/endo/issues/768
55
import '@agoric/babel-standalone';
66
// eslint-disable-next-line import/no-extraneous-dependencies
7-
import '@agoric/install-metering-and-ses';
7+
import '@agoric/install-ses';
88
// eslint-disable-next-line import/no-extraneous-dependencies
99
import test from 'ava';
1010
// eslint-disable-next-line import/no-extraneous-dependencies

packages/zoe/test/swingsetTests/zoe-metering/test-zoe-metering.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// https://github.com/endojs/endo/issues/768
55
import '@agoric/babel-standalone';
66
// eslint-disable-next-line import/no-extraneous-dependencies
7-
import '@agoric/install-metering-and-ses';
7+
import '@agoric/install-ses';
88
// eslint-disable-next-line import/no-extraneous-dependencies
99
import test from 'ava';
1010
import { loadBasedir, buildVatController } from '@agoric/swingset-vat';
@@ -33,6 +33,7 @@ const generateBundlesP = Promise.all(
3333

3434
async function main(argv) {
3535
const config = await loadBasedir(__dirname);
36+
config.defaultManagerType = 'xs-worker';
3637
await generateBundlesP;
3738
const controller = await buildVatController(config, argv);
3839
await controller.run();

packages/zoe/test/swingsetTests/zoe/test-zoe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// https://github.com/endojs/endo/issues/768
77
import '@agoric/babel-standalone';
88
// eslint-disable-next-line import/no-extraneous-dependencies
9-
import '@agoric/install-metering-and-ses';
9+
import '@agoric/install-ses';
1010
// eslint-disable-next-line import/no-extraneous-dependencies
1111
import test from 'ava';
1212
import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';

0 commit comments

Comments
 (0)