test: use ses-ava

a3p-integration/proposals/a:upgrade-next/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/SwingSet/test/test-bundle-handler.js

@@ -1,4 +1,5 @@
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env-ava.js';
 
 import {
   getLockdownBundleSHA256,

packages/SwingSet/test/test-xsnap-store.js

@@ -6,7 +6,8 @@ import fs from 'fs';
 import { tmpName } from 'tmp';
 import { type as osType } from 'os';
 import sqlite3 from 'better-sqlite3';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env-ava.js';
 import { makeMeasureSeconds } from '@agoric/internal';
 import { xsnap } from '@agoric/xsnap';
 import { getLockdownBundle } from '@agoric/xsnap-lockdown';

packages/SwingSet/test/transcript/test-state-sync-reload.js

@@ -1,6 +1,7 @@
 // @ts-nocheck
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../../tools/prepare-test-env-ava.js';
 
 import tmp from 'tmp';
 import { kunser } from '@agoric/kmarshal';

packages/SwingSet/test/transcript/test-transcript-entries.js

@@ -1,6 +1,7 @@
 // @ts-nocheck
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../../tools/prepare-test-env-ava.js';
 
 import { kunser } from '@agoric/kmarshal';
 import { initSwingStore } from '@agoric/swing-store';

packages/SwingSet/test/virtualObjects/test-facet-retention.js

@@ -1,5 +1,6 @@
 // @ts-nocheck
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../../tools/prepare-test-env-ava.js';
 
 import { kunser } from '@agoric/kmarshal';
 import { initSwingStore } from '@agoric/swing-store';

packages/SwingSet/test/xsnap-stable-bundles/test-stable-bundles.js

@@ -1,5 +1,6 @@
 // @ts-nocheck
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../../tools/prepare-test-env-ava.js';
 import { createHash } from 'crypto';
 
 import { initSwingStore } from '@agoric/swing-store';

packages/access-token/package.json

@@ -23,6 +23,8 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
+    "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
     "@types/n-readlines": "^1.0.3",
     "@types/proper-lockfile": "^4.1.2",
     "ava": "^5.3.0",

packages/access-token/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/access-token/test/test-state.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 import { tmpDir } from './tmp.js';
 import {
   initJSONStore,

packages/access-token/test/test-token.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 import { tmpDir } from './tmp.js';
 
 import { getAccessToken } from '../src/access-token.js';

packages/agoric-cli/package.json

@@ -29,6 +29,8 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
+    "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
     "@agoric/cosmic-swingset": "^0.41.3",
     "@agoric/deploy-script-support": "^0.10.3",
     "ava": "^5.3.0",

packages/agoric-cli/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/agoric-cli/test/test-inter-cli.js

@@ -1,7 +1,7 @@
 // @ts-check
 /* global Buffer */
-import '@endo/init';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
 import { createCommand, CommanderError } from 'commander';
 
 import { Far } from '@endo/far';

packages/agoric-cli/test/test-main.js

@@ -2,8 +2,8 @@
 import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init/pre.js';
 import 'esm';
-import '@endo/init/debug.js';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
 import fs from 'fs';
 import anylogger from 'anylogger';
 

packages/agoric-cli/test/test-publish-bundle.js

@@ -1,10 +1,8 @@
 // @ts-check
 /* eslint-env node */
 
-import '@endo/init/debug.js';
-
 import * as http from 'http';
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
 import { makeJsonHttpClient } from '../src/json-http-client-node.js';
 import {

packages/cache/test/test-storage.js

@@ -1,7 +1,6 @@
 // Must be first to set up globals
-import '@agoric/zoe/tools/prepare-test-env.js';
+import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-import test from 'ava';
 import { makeChainStorageRoot } from '@agoric/internal/src/lib-chainStorage.js';
 
 import { Far, makeMarshal } from '@endo/marshal';

packages/cosmic-swingset/package.json

@@ -49,6 +49,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
+    "@endo/ses-ava": "^1.1.2",
     "ava": "^5.3.0",
     "c8": "^7.13.0"
   },

packages/cosmic-swingset/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/cosmic-swingset/test/test-clean-core-eval.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 import {
   defangEvaluableCode,
   compartmentEvaluate,

packages/cosmic-swingset/test/test-export-storage.js

@@ -1,5 +1,5 @@
 // @ts-check
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 import { exportStorage } from '../src/export-storage.js';
 
 const makeBatchChainStorage = published => {

packages/cosmic-swingset/test/test-provision-smartwallet.js

@@ -1,5 +1,6 @@
 /* global setTimeout */
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
 
 // Use ambient authority only in test.before()
 import { spawn as ambientSpawn } from 'child_process';

packages/governance/test/swingsetTests/committeeBinary/test-committee.js

@@ -1,6 +1,6 @@
 /* eslint-disable ava/assertion-arguments -- the standard diff is unreadable */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import test from 'ava';
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
 import bundleSource from '@endo/bundle-source';
 import zcfBundle from '@agoric/zoe/bundles/bundle-contractFacet.js';

packages/inter-protocol/test/vaultFactory/test-storeUtils.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { AmountMath } from '@agoric/ertp';
 import { Far } from '@endo/marshal';

packages/internal/package.json

@@ -34,10 +34,14 @@
   },
   "devDependencies": {
     "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
     "ava": "^5.3.0",
     "tsd": "^0.30.4"
   },
   "ava": {
+    "files": [
+      "test/**/test-*.js"
+    ],
     "require": [
       "@endo/init/debug.js"
     ]

packages/internal/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/internal/test/test-callback.js

@@ -1,5 +1,6 @@
 // @ts-check
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
 
 import { Far } from '@endo/far';
 import { makeHeapZone } from '@agoric/base-zone/heap.js';

packages/internal/test/test-netstring.js

@@ -1,5 +1,5 @@
 /* global Buffer */
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
 import {
   encode,

packages/internal/test/test-priority-senders.js

@@ -1,5 +1,5 @@
 // @ts-check
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
 import { makeFakeStorageKit } from '../src/storage-test-utils.js';
 import { HIGH_PRIORITY_SENDERS } from '../src/chain-storage-paths.js';

packages/internal/test/test-storage-test-utils.js

@@ -1,5 +1,7 @@
 // @ts-check
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
+
 import { Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 

packages/internal/test/test-upgrade-api.js

@@ -1,5 +1,5 @@
 // @ts-check
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 import {
   makeUpgradeDisconnection,
   isUpgradeDisconnection,

packages/internal/test/test-utils.js

@@ -1,6 +1,7 @@
 // @ts-check
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
+// eslint-disable-next-line import/order
 import { Far } from '@endo/far';
 import {
   makeMeasureSeconds,

packages/kmarshal/package.json

@@ -26,6 +26,8 @@
     "@agoric/assert": "^0.6.0"
   },
   "devDependencies": {
+    "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
     "ava": "^5.3.0"
   },
   "publishConfig": {

packages/kmarshal/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/kmarshal/test/test-basic.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
 import { kser, kunser, krefOf, kslot } from '../src/kmarshal.js';
 

packages/notifier/test/prepare-test-env-ava.js

@@ -1,4 +1,7 @@
-import { wrapTest } from '@endo/ses-ava';
+import '@endo/init/debug.js';
+
 import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
 
+/** @type {typeof rawTest} */
 export const test = wrapTest(rawTest);

packages/notifier/test/test-publish-kit.js

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
 /* eslint-disable no-void */
 
-import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import test from 'ava';
+import { test } from '@agoric/swingset-liveslots/tools/prepare-test-env-ava.js';
+
 import { E } from '@endo/far';
 import {
   buildKernelBundles,
@@ -80,7 +80,7 @@
     }
   } else {
     const { tail: _tail, ...props } = firstCell;
     cells.slice(1).forEach((cell, i) => {
       t.like(cell, props, `${label} cell ${i + 1} must match cell 0`);
     });
   }

packages/store/test/prepare-test-env-ava.js

@@ -1,5 +1,7 @@
-import { wrapTest } from '@endo/ses-ava';
+import '@endo/init/debug.js';
+
 import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
 
 /** @type {typeof rawTest} */
 export const test = wrapTest(rawTest);

packages/store/test/test-AtomicProvider.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-use-before-define */
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
 
-import test from 'ava';
 import { Far } from '@endo/marshal';
 import { setTimeout } from 'timers';
 

packages/store/test/test-store.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-use-before-define */
+import { test } from './prepare-test-env-ava.js';
 
-import test from 'ava';
-
+// eslint-disable-next-line import/order
 import { Far, passStyleOf } from '@endo/marshal';
 import { makeLegacyMap } from '../src/legacy/legacyMap.js';
 import { makeLegacyWeakMap } from '../src/legacy/legacyWeakMap.js';

packages/swing-store/package.json

@@ -31,6 +31,7 @@
   },
   "devDependencies": {
     "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
     "@types/better-sqlite3": "^7.5.0",
     "ava": "^5.3.0",
     "c8": "^7.13.0",

packages/swing-store/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import '@endo/init/debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '@endo/ses-ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

packages/swing-store/test/test-bundles.js

@@ -1,5 +1,7 @@
 // @ts-check
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
+
 import tmp from 'tmp';
 import { Buffer } from 'buffer';
 import { createSHA256 } from '../src/hasher.js';

packages/swing-store/test/test-deletion.js

@@ -1,5 +1,7 @@
 // @ts-check
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
+
+// eslint-disable-next-line import/order
 import { Buffer } from 'node:buffer';
 import { initSwingStore } from '../src/swingStore.js';
 

packages/swing-store/test/test-export.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
 import { buffer } from '../src/util.js';
 import { initSwingStore, makeSwingStoreExporter } from '../src/index.js';

packages/swing-store/test/test-exportImport.js

@@ -1,8 +1,9 @@
 // @ts-check
+// eslint-disable-next-line import/order
+import { test } from './prepare-test-env-ava.js';
 
 import { Buffer } from 'node:buffer';
 
-import test from 'ava';
 import tmp from 'tmp';
 import bundleSource from '@endo/bundle-source';
 

packages/swing-store/test/test-hasher.js

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { test } from './prepare-test-env-ava.js';
 
 // eslint-disable-next-line import/order
 import { createSHA256 } from '../src/hasher.js';