Merge pull request #5793 from Agoric/4895-ava-4.3

upgrade to Ava 4.3
Agoric · Aug 4, 2022 · cc6836c · cc6836c
2 parents 00d565d + 9828b03
commit cc6836c
Show file tree

Hide file tree

Showing 62 changed files with 1,703 additions and 1,786 deletions.
diff --git a/golang/cosmos/package.json b/golang/cosmos/package.json
@@ -2,6 +2,9 @@
   "name": "@agoric/cosmos",
   "version": "0.30.0",
   "description": "Connect JS to the Cosmos blockchain SDK",
+  "parsers": {
+    "js": "mjs"
+  },
   "main": "src/index.cjs",
   "engines": {
     "node": ">=14.15.0"

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "@jessie.js/eslint-plugin": "^0.2.0",
     "@types/node": "^16.7.10",
     "@typescript-eslint/parser": "^5.30.7",
-    "ava": "^3.15.0",
+    "ava": "^4.3.1",
     "c8": "^7.11.0",
     "conventional-changelog-conventionalcommits": "^4.6.0",
     "eslint-config-airbnb-base": "^14.2.0",
@@ -66,7 +66,7 @@
     "timeout": "30m"
   },
   "dependencies": {
-    "patch-package": "^6.2.2"
+    "patch-package": "^6.4.7"
   },
   "resolutions": {
     "**/http-errors/depd": "^2.0.0",

diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@endo/bundle-source": "^2.2.2",
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "fast-check": "^2.21.0"
   },
   "files": [

diff --git a/packages/ERTP/test/unitTests/test-amountProperties.js b/packages/ERTP/test/unitTests/test-amountProperties.js
@@ -4,7 +4,6 @@ import fc from 'fast-check';
 
 import { AmountMath as m, AssetKind } from '../../src/index.js';
 import { mockBrand } from './mathHelpers/mockBrand.js';
-import { assertionPassed } from '../../../store/test/test-store.js';
 
 // Perhaps makeCopyBag should coalesce duplicate labels, but for now, it does
 // not.
@@ -36,23 +35,13 @@ test('isEqual is a (total) equivalence relation', async t => {
       ({ x, y, z }) => {
         return (
           // Total
-          assertionPassed(t.true([true, false].includes(m.isEqual(x, y))), () =>
-            [true, false].includes(m.isEqual(x, y)),
-          ) &&
+          t.true([true, false].includes(m.isEqual(x, y))) &&
           // Reflexive
-          assertionPassed(t.true(m.isEqual(x, x)), () => m.isEqual(x, x)) &&
+          t.true(m.isEqual(x, x)) &&
           // Symmetric
-          assertionPassed(
-            t.true(implies(m.isEqual(x, y), m.isEqual(y, x))),
-            () => implies(m.isEqual(x, y), m.isEqual(y, x)),
-          ) &&
+          t.true(implies(m.isEqual(x, y), m.isEqual(y, x))) &&
           // Transitive
-          assertionPassed(
-            t.true(
-              implies(m.isEqual(x, y) && m.isEqual(y, z), m.isEqual(x, z)),
-            ),
-            () => implies(m.isEqual(x, y) && m.isEqual(y, z), m.isEqual(x, z)),
-          )
+          t.true(implies(m.isEqual(x, y) && m.isEqual(y, z), m.isEqual(x, z)))
         );
       },
     ),
@@ -64,18 +53,13 @@ test('isGTE is a partial order with empty as minimum', async t => {
   await fc.assert(
     fc.property(fc.record({ x: arbAmount, y: arbAmount }), ({ x, y }) => {
       return (
-        assertionPassed(t.true(m.isGTE(x, empty)), () => m.isGTE(x, empty)) &&
+        t.true(m.isGTE(x, empty)) &&
         // Total
-        assertionPassed(t.true([true, false].includes(m.isGTE(x, y))), () =>
-          [true, false].includes(m.isGTE(x, y)),
-        ) &&
+        t.true([true, false].includes(m.isGTE(x, y))) &&
         // Reflexive
-        assertionPassed(t.true(m.isGTE(x, x)), () => m.isGTE(x, x)) &&
+        t.true(m.isGTE(x, x)) &&
         // Antisymmetric
-        assertionPassed(
-          t.true(implies(m.isGTE(x, y) && m.isGTE(y, x), m.isEqual(x, y))),
-          () => implies(m.isGTE(x, y) && m.isGTE(y, x), m.isEqual(x, y)),
-        )
+        t.true(implies(m.isGTE(x, y) && m.isGTE(y, x), m.isEqual(x, y)))
       );
     }),
   );
@@ -89,34 +73,20 @@ test('add: closed, commutative, associative, monotonic, with empty identity', as
       ({ x, y, z }) => {
         return (
           // note: + for SET is not total.
-          assertionPassed(t.truthy(m.coerce(mockBrand, m.add(x, y))), () =>
-            m.coerce(mockBrand, m.add(x, y)),
-          ) &&
+          t.truthy(m.coerce(mockBrand, m.add(x, y))) &&
           // Identity (right)
-          assertionPassed(t.true(m.isEqual(m.add(x, empty), x)), () =>
-            m.isEqual(m.add(x, empty), x),
-          ) &&
+          t.true(m.isEqual(m.add(x, empty), x)) &&
           // Identity (left)
-          assertionPassed(t.true(m.isEqual(m.add(empty, x), x)), () =>
-            m.isEqual(m.add(empty, x), x),
-          ) &&
+          t.true(m.isEqual(m.add(empty, x), x)) &&
           // Commutative
-          assertionPassed(t.true(m.isEqual(m.add(x, y), m.add(y, x))), () =>
-            m.isEqual(m.add(x, y), m.add(y, x)),
-          ) &&
+          t.true(m.isEqual(m.add(x, y), m.add(y, x))) &&
           // Associative
-          assertionPassed(
-            t.true(m.isEqual(m.add(m.add(x, y), z), m.add(x, m.add(y, z)))),
-            () => m.isEqual(m.add(m.add(x, y), z), m.add(x, m.add(y, z))),
-          ) &&
+
+          t.true(m.isEqual(m.add(m.add(x, y), z), m.add(x, m.add(y, z)))) &&
           // Monotonic (left)
-          assertionPassed(t.true(m.isGTE(m.add(x, y), x)), () =>
-            m.isGTE(m.add(x, y), x),
-          ) &&
+          t.true(m.isGTE(m.add(x, y), x)) &&
           // Monotonic (right)
-          assertionPassed(t.true(m.isGTE(m.add(x, y), y)), () =>
-            m.isGTE(m.add(x, y), y),
-          )
+          t.true(m.isGTE(m.add(x, y), y))
         );
       },
     ),
@@ -127,16 +97,8 @@ test('subtract: (x + y) - y = x; (y - x) + x = y if y >= x', async t => {
   await fc.assert(
     fc.property(fc.record({ x: arbAmount, y: arbAmount }), ({ x, y }) => {
       return (
-        assertionPassed(t.true(m.isEqual(m.subtract(m.add(x, y), y), x)), () =>
-          m.isEqual(m.subtract(m.add(x, y), y), x),
-        ) &&
-        assertionPassed(
-          t.true(
-            m.isGTE(y, x) ? m.isEqual(m.add(m.subtract(y, x), x), y) : true,
-          ),
-          () =>
-            m.isGTE(y, x) ? m.isEqual(m.add(m.subtract(y, x), x), y) : true,
-        )
+        t.true(m.isEqual(m.subtract(m.add(x, y), y), x)) &&
+        t.true(m.isGTE(y, x) ? m.isEqual(m.add(m.subtract(y, x), x), y) : true)
       );
     }),
   );

diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -77,7 +77,8 @@
     "files": [
       "test/**/test-*.js"
     ],
-    "timeout": "20m"
+    "timeout": "20m",
+    "workerThreads": false
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/SwingSet/test/snapshots/test-state.js.snap b/packages/SwingSet/test/snapshots/test-state.js.snap
diff --git a/packages/SwingSet/test/snapshots/test-xsnap-store.js.snap b/packages/SwingSet/test/snapshots/test-xsnap-store.js.snap
diff --git a/packages/access-token/package.json b/packages/access-token/package.json
@@ -21,7 +21,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.7.2"
   },
   "publishConfig": {

diff --git a/packages/agoric-cli/.ava-integration-test.config.js b/packages/agoric-cli/.ava-integration-test.config.js
@@ -1,4 +1,5 @@
 export default {
   files: ['integration-tests/test-workflow.js'],
   timeout: '10m',
+  workerThreads: false,
 };
diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.28.0",
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.11.0",
     "tmp": "^0.2.1"
   },
@@ -64,6 +64,7 @@
     "files": [
       "test/**/test-*.js"
     ],
-    "timeout": "2m"
+    "timeout": "2m",
+    "workerThreads": false
   }
 }
diff --git a/packages/agoric-cli/test/test-publish-bundle.js b/packages/agoric-cli/test/test-publish-bundle.js
@@ -30,6 +30,7 @@ test('fake publish bundle ok', async t => {
         t.is(hostname, 'localhost');
         t.is(port, 8080);
         t.is(path, '/publish-bundle?accessToken=TO%20KEN');
+        // @ts-expect-error unknown
         t.is(bundle, receivedBundle);
         return { ok: true };
       },

diff --git a/packages/assert/package.json b/packages/assert/package.json
@@ -31,17 +31,14 @@
     "url": "https://github.com/Agoric/agoric-sdk/issues"
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
-  "devDependencies": {
-    "ava": "^3.12.1"
-  },
   "files": [
     "src/",
     "exported.js",
     "NEWS.md"
   ],
-  "ava": {
-    "files": [
-      "test/**/test-*.js"
+  "eslintConfig": {
+    "extends": [
+      "@agoric"
     ]
   },
   "eslintIgnore": [

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -24,7 +24,7 @@
     "@endo/marshal": "^0.6.9"
   },
   "devDependencies": {
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.7.2",
     "@agoric/vat-data": "^0.3.1",
     "@agoric/zoe": "^0.24.0"

diff --git a/packages/casting/package.json b/packages/casting/package.json
@@ -34,7 +34,7 @@
     "node-fetch": "^2.6.0"
   },
   "devDependencies": {
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.7.2",
     "express": "^4.17.1",
     "ws": "^7.2.0",
@@ -50,6 +50,7 @@
     "files": [
       "test/**/test-*.js"
     ],
-    "timeout": "20m"
+    "timeout": "20m",
+    "workerThreads": false
   }
 }
diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json
@@ -45,7 +45,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.7.2"
   },
   "publishConfig": {

diff --git a/packages/deploy-script-support/package.json b/packages/deploy-script-support/package.json
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.28.0",
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "import-meta-resolve": "^1.1.1"
   },
   "files": [

diff --git a/packages/governance/package.json b/packages/governance/package.json
@@ -47,7 +47,7 @@
     "@agoric/swingset-vat": "^0.28.0",
     "@endo/bundle-source": "^2.2.2",
     "@endo/init": "^0.5.43",
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.11.0",
     "import-meta-resolve": "^1.1.1",
     "ses": "^0.15.17"

diff --git a/packages/import-manager/package.json b/packages/import-manager/package.json
@@ -30,7 +30,7 @@
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "devDependencies": {
     "@agoric/swingset-vat": "^0.28.0",
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.7.2"
   },
   "files": [

diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@agoric/deploy-script-support": "^0.9.0",
     "@endo/init": "^0.5.43",
-    "ava": "^3.12.1",
+    "ava": "^4.3.1",
     "c8": "^7.11.0",
     "deep-object-diff": "^1.1.7",
     "fast-check": "^2.21.0",

diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js
@@ -14,8 +14,7 @@ import { setupAmmServices } from './setup.js';
 /** @typedef {Record<string, any> & {
  *   bundleCache: Awaited<ReturnType<typeof unsafeMakeBundleCache>>,
  * }} Context */
-/** @type {import('ava').TestInterface<Context>} */
-// @ts-expect-error cast
+/** @type {import('ava').TestFn<Context>} */
 const test = unknownTest;
 
 test.before(async t => {

diff --git a/packages/inter-protocol/test/psm/test-psm.js b/packages/inter-protocol/test/psm/test-psm.js
@@ -25,8 +25,7 @@ import {
   subscriptionKey,
 } from '../supports.js';
 
-/** @type {import('ava').TestInterface<Awaited<ReturnType<makeTestContext>>>} */
-// @ts-expect-error cast
+/** @type {import('ava').TestFn<Awaited<ReturnType<makeTestContext>>>} */
 const test = anyTest;
 
 const pathname = new URL(import.meta.url).pathname;

diff --git a/packages/inter-protocol/test/stakeFactory/test-stakeFactory.js b/packages/inter-protocol/test/stakeFactory/test-stakeFactory.js
@@ -73,8 +73,7 @@ const micro = harden({
  *   },
  * }} StakeFactoryTestContext
  */
-/** @type {import('ava').TestInterface<StakeFactoryTestContext>} */
-// @ts-expect-error cast
+/** @type {import('ava').TestFn<StakeFactoryTestContext>} */
 const test = unknownTest;
 
 test.before(async t => {

diff --git a/packages/inter-protocol/test/swingsetTests/governance/test-governance.js b/packages/inter-protocol/test/swingsetTests/governance/test-governance.js
@@ -10,15 +10,14 @@ import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js'
 import zcfBundle from '@agoric/zoe/bundles/bundle-contractFacet.js';
 import bundleSource from '@endo/bundle-source';
 import { E } from '@endo/eventual-send';
-import rawTest from 'ava';
+import anyTest from 'ava';
 
 // import '../../../src/vaultFactory/vaultFactory.js';
 
 const dirname = new URL('.', import.meta.url).pathname;
 
-/** @type {import('ava').TestInterface<{ data: { kernelBundles: any, config: any } }>} */
-// @ts-expect-error cast
-const test = rawTest;
+/** @type {import('ava').TestFn<{ data: { kernelBundles: any, config: any } }>} */
+const test = anyTest;
 
 test.before(async t => {
   const kernelBundles = await buildKernelBundles();

diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js
@@ -1,9 +1,7 @@
 // @ts-check
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init/debug.js';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import rawTest from 'ava';
+import anyTest from 'ava';
 import path from 'path';
 import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
 import bundleSource from '@endo/bundle-source';
@@ -17,9 +15,8 @@ import liquidateMinimumBundle from '../../../bundles/bundle-liquidateMinimum.js'
 import ammBundle from '../../../bundles/bundle-amm.js';
 import vaultFactoryBundle from '../../../bundles/bundle-vaultFactory.js';
 
-/** @type {import('ava').TestInterface<{ data: { kernelBundles: any, config: any } }>} */
-// @ts-expect-error cast
-const test = rawTest;
+/** @type {import('ava').TestFn<{ data: { kernelBundles: any, config: any } }>} */
+const test = anyTest;
 
 /**
  *

diff --git a/packages/inter-protocol/test/test-gov-collateral.js b/packages/inter-protocol/test/test-gov-collateral.js
@@ -32,8 +32,7 @@ import { setupBootstrap, setUpZoeForTest, mintRunPayment } from './supports.js';
 const { details: X } = assert;
 const dirname = url.fileURLToPath(new URL('.', import.meta.url));
 
-/** @type {import('ava').TestInterface<Awaited<ReturnType<typeof makeTestContext>>>} */
-// @ts-expect-error cast
+/** @type {import('ava').TestFn<Awaited<ReturnType<typeof makeTestContext>>>} */
 const test = anyTest;
 
 const contractRoots = {

diff --git a/packages/inter-protocol/test/test-interchainPool.js b/packages/inter-protocol/test/test-interchainPool.js
@@ -11,8 +11,7 @@ import { setUpZoeForTest } from './supports.js';
 
 /** @template T @typedef {import('@endo/promise-kit').PromiseKit<T>} PromiseKit */
 
-/** @type {import('ava').TestInterface<Awaited<ReturnType<makeTestContext>>>} */
-// @ts-expect-error cast
+/** @type {import('ava').TestFn<Awaited<ReturnType<makeTestContext>>>} */
 const test = anyTest;
 
 const contractRoots = {