Merge pull request #8205 from Agoric/ta/ava-prepare

always init Endo in tests

packages/ERTP/package.json

@@ -74,6 +74,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "5m"
   },
   "publishConfig": {

packages/SwingSet/package.json

@@ -88,6 +88,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   },

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

@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 
 import {

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

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* global globalThis */
-import '@endo/init/debug.js';
 
 import { spawn } from 'child_process';
 import fs from 'fs';

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

@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
 import test from 'ava';
-import '@endo/init/debug.js';
 import tmp from 'tmp';
 import {
   initSwingStore,

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

@@ -1,7 +1,6 @@
 // @ts-nocheck
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
 import test from 'ava';
-import '@endo/init/debug.js';
 import { initSwingStore } from '@agoric/swing-store';
 import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
 import { buildKernelBundle } from '../../src/controller/initializeSwingset.js';

packages/SwingSet/test/vat-warehouse/test-warehouse.js

@@ -1,9 +1,7 @@
 // @ts-check
 
-import '@endo/init/pre-bundle-source.js';
-
-// eslint-disable-next-line import/order
 import { test } from '../../tools/prepare-test-env-ava.js';
+
 import { buildVatController } from '../../src/index.js';
 import { makeLRU } from '../../src/kernel/vat-warehouse.js';
 

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

@@ -1,5 +1,4 @@
 // @ts-nocheck
-import '@endo/init/debug.js';
 import test from 'ava';
 import { initSwingStore } from '@agoric/swing-store';
 import { buildVatController } from '../../src/index.js';

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

@@ -1,5 +1,4 @@
 // @ts-nocheck
-import '@endo/init/debug.js';
 import test from 'ava';
 import { createHash } from 'crypto';
 

packages/SwingSet/tools/prepare-test-env-ava.js

@@ -13,9 +13,6 @@ import '@endo/ses-ava/exported.js';
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
-/** @type {typeof rawTest} */
-// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
-// @ts-ignore XXX https://github.com/endojs/endo/issues/1235
 export const test = wrapTest(rawTest);
 
 // Does not import from a module because we're testing the global env

packages/access-token/package.json

@@ -31,6 +31,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }

packages/assert/package.json

@@ -21,6 +21,11 @@
     "@endo/init": "^0.5.57",
     "ava": "^5.3.0"
   },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ]
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Agoric/agoric-sdk.git"

packages/assert/test/test-assert.js

@@ -1,5 +1,3 @@
-import '@endo/init';
-// eslint-disable-next-line import/no-unresolved -- lint error not worth solving; test passes
 import test from 'ava';
 
 import { NonNullish, Fail } from '../src/assert.js';

packages/base-zone/package.json

@@ -46,6 +46,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }

packages/base-zone/test/prepare-test-env-ava.js

@@ -1,5 +1,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import '@endo/init/debug.js';
 
 import test from 'ava';
 

packages/boot/package.json

@@ -66,6 +66,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }

packages/builders/package.json

@@ -72,6 +72,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }

packages/cache/package.json

@@ -42,6 +42,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m"
   }
 }

packages/cosmic-swingset/package.json

@@ -61,6 +61,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m"
   }
 }

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

@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import {
   defangEvaluableCode,

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

@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 import { exportStorage } from '../src/export-storage.js';
 

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

@@ -1,5 +1,4 @@
 /* global setTimeout */
-import '@endo/init/debug.js';
 import test from 'ava';
 
 // Use ambient authority only in test.before()

packages/deploy-script-support/package.json

@@ -64,6 +64,9 @@
   "ava": {
     "files": [
       "test/**/test-*.js"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ]
   },
   "publishConfig": {

packages/deploy-script-support/test/unitTests/test-assertOfferResult.js

@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init';
 
 import { assertOfferResult } from '../../src/assertOfferResult.js';
 

packages/governance/package.json

@@ -67,6 +67,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "10m"
   },
   "publishConfig": {

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

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

packages/governance/test/swingsetTests/contractGovernor/test-governor.js

@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 import path from 'path';
 

packages/inter-protocol/package.json

@@ -73,6 +73,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "workerThreads": false,
     "timeout": "10m"
   },

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

@@ -1,6 +1,3 @@
-// Must be first to set up globals
-import '@endo/init/debug.js';
-// Consider ses-ava once https://github.com/endojs/endo/issues/1235 is resolved
 import test from 'ava';
 
 import { AmountMath } from '@agoric/ertp';

packages/internal/package.json

@@ -36,6 +36,11 @@
     "ava": "^5.3.0",
     "tsd": "^0.28.1"
   },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ]
+  },
   "author": "Agoric",
   "license": "Apache-2.0",
   "files": [

packages/internal/src/install-ses-debug.js

@@ -3,4 +3,4 @@
 // The setting below are *unsafe* and should not be used in contact with
 // genuinely malicious code.
 
-export * from '@endo/init/debug.js';
+import '@endo/init/debug.js';

packages/internal/test/test-callback.js

@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 
 import { Far } from '@endo/far';

packages/internal/test/test-netstring.js

@@ -1,5 +1,4 @@
 /* global Buffer */
-import '@endo/init/debug.js';
 import test from 'ava';
 
 import {

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

@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init/debug.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,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 

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

@@ -1,5 +1,4 @@
 // @ts-check
-import '@endo/init';
 import test from 'ava';
 import {
   makeUpgradeDisconnection,

packages/internal/test/test-utils.js

@@ -1,6 +1,5 @@
 // @ts-check
 import test from 'ava';
-import '@endo/init';
 
 import { Far } from '@endo/far';
 import {

packages/network/package.json

@@ -57,6 +57,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }

packages/notifier/package.json

@@ -69,6 +69,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }

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

@@ -1,8 +1,4 @@
-import '@endo/init';
-
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 
-// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
-// @ts-ignore -- https://github.com/endojs/endo/issues/1235
 export const test = wrapTest(rawTest);

packages/pegasus/package.json

@@ -59,6 +59,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "10m"
   },
   "publishConfig": {

packages/smart-wallet/package.json

@@ -58,6 +58,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   },
   "publishConfig": {

packages/solo/package.json

@@ -71,6 +71,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "20m",
     "workerThreads": false
   }

packages/spawner/package.json

@@ -55,6 +55,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }

packages/store/package.json

@@ -54,6 +54,9 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   }
 }

packages/store/test/perf-patterns.js

@@ -1,5 +1,3 @@
-import '@endo/init/debug.js';
-
 import { Far, makeTagged } from '@endo/marshal';
 import {
   makeCopyBag,

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

@@ -1,5 +1,3 @@
-import '@endo/init/debug.js';
-
 import { wrapTest } from '@endo/ses-ava';
 import rawTest from 'ava';
 

packages/store/test/test-AtomicProvider.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-use-before-define */
-import '@endo/init/debug.js';
 
 import test from 'ava';
 import { Far } from '@endo/marshal';

packages/store/test/test-store.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-use-before-define */
-import '@endo/init/debug.js';
 
 import test from 'ava';