chore: fix tests

Agoric · May 31, 2022 · ecb3804 · ecb3804
1 parent 695fe90
commit ecb3804
Show file tree

Hide file tree

Showing 43 changed files with 45 additions and 38 deletions.
diff --git a/packages/SwingSet/test/test-xsnap-errors.js b/packages/SwingSet/test/test-xsnap-errors.js
@@ -1,5 +1,5 @@
 /* global setTimeout */
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/order
 import { test } from '../tools/prepare-test-env-ava.js';
 import { spawn } from 'child_process';

diff --git a/packages/SwingSet/test/vat-warehouse/test-warehouse.js b/packages/SwingSet/test/vat-warehouse/test-warehouse.js
@@ -10,6 +10,7 @@ import { makeLRU } from '../../src/kernel/vat-warehouse.js';
 
 async function makeController(managerType, runtimeOptions) {
   const config = await loadBasedir(new URL('./', import.meta.url).pathname);
+  assert(config.vats);
   config.vats.target.creationOptions = { managerType, enableDisavow: true };
   config.vats.target2 = config.vats.target;
   config.vats.target3 = config.vats.target;

diff --git a/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js b/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js
@@ -1,10 +1,12 @@
 // @ts-check
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 
 import { assertOfferResult } from '../../src/assertOfferResult.js';
 
 test('assertOfferResult', async t => {
+  /** @type {UserSeat} */
   const mockSeat = {
+    // @ts-expect-error mock
     getOfferResult: () => 'result',
   };
   await t.notThrowsAsync(() => assertOfferResult(mockSeat, 'result'));

diff --git a/packages/deploy-script-support/test/unitTests/test-findInvitationAmount.js b/packages/deploy-script-support/test/unitTests/test-findInvitationAmount.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
@@ -25,7 +25,6 @@ test('findInvitationAmount', async t => {
     walletAdmin,
     zoe,
     zoeInvitationPurse,
-    brand,
   );
 
   const notFoundResult = await findInvitationAmount({

diff --git a/packages/run-protocol/test/test-gov-collateral.js b/packages/run-protocol/test/test-gov-collateral.js
@@ -158,7 +158,6 @@ const makeScenario = async (t, { env = process.env } = {}) => {
       },
       getBankForAddress: () => assert.fail('not impl'),
     });
-    // @ts-ignore mock doesn't have all the methods
     space.produce.bankManager.resolve(bankManager);
 
     space.installation.produce.mintHolder.resolve(

diff --git a/packages/store/test/test-encodePassable.js b/packages/store/test/test-encodePassable.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 /* eslint-disable no-bitwise */
 
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

diff --git a/packages/store/test/test-rankOrder.js b/packages/store/test/test-rankOrder.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 import { Far, makeTagged } from '@endo/marshal';
 import fc from 'fast-check';

diff --git a/packages/xsnap/test/message-tools.js b/packages/xsnap/test/message-tools.js
@@ -23,6 +23,7 @@ export function loader(url, readFile = undefined) {
   return freeze({
     resolve,
     /**  @param { string } ref */
+    // @ts-expect-error possibly undefined
     asset: async ref => readFile(resolve(ref), 'utf-8'),
   });
 }

diff --git a/packages/xsnap/test/test-xs-perf.js b/packages/xsnap/test/test-xs-perf.js
@@ -112,7 +112,9 @@ test('meter details are still available with no limit', async t => {
   t.log(meters);
   t.is(typeof meters.compute, 'number');
   t.is(typeof meters.allocate, 'number');
+  // @ts-expect-error until ava assertion types
   t.true(meters.compute > 0);
+  // @ts-expect-error until ava assertion types
   t.true(meters.allocate > 0);
 });
 
@@ -185,7 +187,6 @@ test('metering switch - start compartment only', async t => {
 function dataStructurePerformance(logn) {
   // eslint-disable-next-line no-bitwise
   const n = 1 << logn;
-  // @ts-expect-error
   const send = it => {
     // eslint-disable-next-line no-undef
     return issueCommand(new TextEncoder().encode(JSON.stringify(it)).buffer);
@@ -234,6 +235,7 @@ test.skip('Array, Map, Set growth is O(log(n))', async t => {
     const {
       meterUsage: { compute },
     } = await vat.evaluate(`dataStructurePerformance(${size})`);
+    // @ts-expect-error pop() may return undefined
     const r = JSON.parse(opts.messages.pop());
     t.log({ compute, r });
     return { compute, r };

diff --git a/packages/xsnap/test/test-xsnap.js b/packages/xsnap/test/test-xsnap.js
@@ -344,6 +344,7 @@ test('normal close of pathological script', async t => {
 async function runToGC() {
   const trashCan = [{}];
   const wr = new WeakRef(trashCan[0]);
+  // @ts-expect-error
   trashCan[0] = undefined;
 
   let qty;

diff --git a/packages/zoe/test/privateArgsUsageContract.js b/packages/zoe/test/privateArgsUsageContract.js
@@ -8,6 +8,7 @@ const start = (_zcf, privateArgs) => {
   const creatorFacet = Far('creatorFacet', {
     usePrivateArgs: () => E(privateArgs.myArg).doTest(),
   });
+  // @ts-expect-error missing publicFacet for ContractStartFn
   return harden({ creatorFacet });
 };
 harden(start);

diff --git a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js
@@ -87,6 +87,7 @@ const start = zcf => {
 
   const creatorInvitation = makeSafeInvitation();
 
+  // @ts-expect-error missing creatorFacet of ContractStartFn
   return harden({ creatorInvitation, publicFacet });
 };
 

diff --git a/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js b/packages/zoe/test/swingsetTests/brokenContracts/test-crashingContract.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';

diff --git a/packages/zoe/test/swingsetTests/brokenContracts/vat-alice.js b/packages/zoe/test/swingsetTests/brokenContracts/vat-alice.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';

diff --git a/packages/zoe/test/swingsetTests/zoe/test-zoe.js b/packages/zoe/test/swingsetTests/zoe/test-zoe.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/zoe/test/unitTests/contractSupport/test-depositTo.js b/packages/zoe/test/unitTests/contractSupport/test-depositTo.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/zoe/test/unitTests/contractSupport/test-withdrawFrom.js b/packages/zoe/test/unitTests/contractSupport/test-withdrawFrom.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/zoe/test/unitTests/contracts/escrowToVote.js b/packages/zoe/test/unitTests/contracts/escrowToVote.js
@@ -1,5 +1,4 @@
-// @ts-check
-
+// @ts-nocheck
 import { assert, details as X, q } from '@agoric/assert';
 import { Far } from '@endo/marshal';
 import { makeStore } from '@agoric/store';

diff --git a/packages/zoe/test/unitTests/contracts/loan/helpers.js b/packages/zoe/test/unitTests/contracts/loan/helpers.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env.js';
 

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-addCollateral.js b/packages/zoe/test/unitTests/contracts/loan/test-addCollateral.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env-ava.js';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-borrow.js b/packages/zoe/test/unitTests/contracts/loan/test-borrow.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env-ava.js';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-close.js b/packages/zoe/test/unitTests/contracts/loan/test-close.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env-ava.js';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-lend.js b/packages/zoe/test/unitTests/contracts/loan/test-lend.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 import '../../../../exported.js';

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-loan-e2e.js b/packages/zoe/test/unitTests/contracts/loan/test-loan-e2e.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env-ava.js';
 // eslint-disable-next-line import/no-extraneous-dependencies

diff --git a/packages/zoe/test/unitTests/contracts/test-atomicSwap.js b/packages/zoe/test/unitTests/contracts/test-atomicSwap.js
@@ -322,7 +322,7 @@ test('zoe - non-fungible atomicSwap', async t => {
   // Alice makes an instance and makes her offer.
   const installation = await alice.installCode();
 
-  const vorpalSword = createRpgItem('Vorpal Sword', 38);
+  const vorpalSword = createRpgItem('Vorpal Sword', 'vorping');
   const vorpalAmount = rpgItems(vorpalSword);
   const bobRpgPayment = await E(rpgMint).mintPayment(vorpalAmount);
   const bob = await makeBob(installation, bobRpgPayment);

diff --git a/packages/zoe/test/unitTests/contracts/test-automaticRefund.js b/packages/zoe/test/unitTests/contracts/test-automaticRefund.js
@@ -1,4 +1,4 @@
-// @ts-check
+test / unitTests / contracts / test - automaticRefund.js;
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/zoe/test/unitTests/contracts/test-coveredCall.js b/packages/zoe/test/unitTests/contracts/test-coveredCall.js
@@ -923,7 +923,7 @@ test('zoe - coveredCall non-fungible', async t => {
   // Setup Bob
   const aGloriousShield = createRpgItem(
     'Glorious Shield',
-    25,
+    'blinding',
     'a Glorious Shield, burnished to a blinding brightness',
   );
   const aGloriousShieldAmount = rpgItems(aGloriousShield);

diff --git a/packages/zoe/test/unitTests/contracts/test-escrowToVote.js b/packages/zoe/test/unitTests/contracts/test-escrowToVote.js
@@ -162,6 +162,7 @@ test('zoe - escrowToVote', async t => {
 
     // Voter3 exits before the election is closed. Voter3's vote will
     // not be counted.
+    assert(seat.tryExit);
     seat.tryExit();
 
     return { voter, seat };

diff --git a/packages/zoe/test/unitTests/contracts/test-priceAggregatorChainlink.js b/packages/zoe/test/unitTests/contracts/test-priceAggregatorChainlink.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/zoe/test/unitTests/contracts/test-simpleExchange.js b/packages/zoe/test/unitTests/contracts/test-simpleExchange.js
@@ -425,7 +425,9 @@ test('simpleExchange with non-fungible assets', async t => {
   // Assert that the correct payout were received.
   // Alice has an empty RPG purse, and the Cheshire Cat.
   // Bob has an empty CryptoCat purse, and the Spell of Binding he wanted.
+  // @ts-expect-error get may fail
   const noCats = AmountMath.makeEmpty(brands.get('cc'), AssetKind.SET);
+  // @ts-expect-error get may fail
   const noRpgItems = AmountMath.makeEmpty(brands.get('rpg'), AssetKind.SET);
   await assertPayoutAmount(t, rpgIssuer, aliceRpgPayout, noRpgItems);
   const cheshireCatAmount = cryptoCats(harden(['Cheshire Cat']));

diff --git a/packages/zoe/test/unitTests/contracts/test-useObj.js b/packages/zoe/test/unitTests/contracts/test-useObj.js
@@ -63,6 +63,7 @@ test('zoe - useObj', async t => {
     `use of use object works`,
   );
 
+  assert(aliceSeat.tryExit);
   aliceSeat.tryExit();
 
   const aliceMoolaPayoutPayment = await E(aliceSeat).getPayout('Pixels');

diff --git a/packages/zoe/test/unitTests/contracts/throwInOfferHandler.js b/packages/zoe/test/unitTests/contracts/throwInOfferHandler.js
@@ -10,7 +10,7 @@ import { depositToSeat } from '../../../src/contractSupport/index.js';
  * This is a a broken contact to test that
  * errors in offerHandlers are appropriately handled
  *
- * @type {ContractStartFn<undefined, {makeThrowInOfferHandlerInvitation: unknown, makeThrowInDepositToSeatInvitation: unknown}>}
+ * @param {ZCF} zcf
  */
 const start = zcf => {
   const throwInOfferHandler = _seat => {

diff --git a/packages/zoe/test/unitTests/contracts/useObjExample.js b/packages/zoe/test/unitTests/contracts/useObjExample.js
@@ -13,7 +13,7 @@ import {
 /**
  * Give a use object when a payment is escrowed
  *
- * @type {ContractStartFn}
+ * @param {ZCF} zcf
  */
 const start = zcf => {
   const {

diff --git a/packages/zoe/test/unitTests/setupNonFungibleMints.js b/packages/zoe/test/unitTests/setupNonFungibleMints.js
@@ -24,7 +24,7 @@ const setupNonFungible = () => {
   /**
    *
    * @param {string} name
-   * @param {number} power
+   * @param {string} power
    * @param {string} [desc]
    */
   function createRpgItem(name, power, desc) {

diff --git a/packages/zoe/test/unitTests/test-instanceStorage.js b/packages/zoe/test/unitTests/test-instanceStorage.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';

diff --git a/packages/zoe/test/unitTests/test-zoe-env.js b/packages/zoe/test/unitTests/test-zoe-env.js
@@ -9,7 +9,6 @@ test('harden from SES is in the zoe contract environment', t => {
 });
 
 test('(mock) kind makers from SwingSet are in the zoe contract environment', t => {
-  // @ts-expect-error testing existence of function only
   VatData.defineKind('x', () => {}, {});
   VatData.defineKindMulti('x', () => {}, { x: {}, y: {} });
   const kh = VatData.makeKindHandle();
@@ -19,7 +18,6 @@ test('(mock) kind makers from SwingSet are in the zoe contract environment', t =
 });
 
 test('(mock) store makers from SwingSet are in the zoe contract environment', t => {
-  // @ts-expect-error testing existence of function only
   VatData.makeScalarBigMapStore();
   VatData.makeScalarBigWeakMapStore();
   VatData.makeScalarBigSetStore();

diff --git a/packages/zoe/test/unitTests/zcf/test-reallocate-empty.js b/packages/zoe/test/unitTests/zcf/test-reallocate-empty.js
@@ -61,7 +61,6 @@ test(`zcf.reallocate unstaged`, async t => {
   const { brand } = zcfMint.getIssuerRecord();
   const empty = AmountMath.makeEmpty(brand, AssetKind.NAT);
   zcfSeat1.incrementBy(harden({ RUN: empty }));
-  // @ts-expect-error Deliberate wrong type for testing
   t.throws(() => zcf.reallocate(zcfSeat1, zcfSeat2), {
     message:
       'Reallocate failed because a seat had no staged allocation. Please add or subtract from the seat and then reallocate.',

diff --git a/packages/zoe/test/unitTests/zcf/test-zcf.js b/packages/zoe/test/unitTests/zcf/test-zcf.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/zoe/test/unitTests/zcf/test-zcfSeat-exit.js b/packages/zoe/test/unitTests/zcf/test-zcfSeat-exit.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/zoe/test/unitTests/zcf/test-zoeHelpersWZcf.js b/packages/zoe/test/unitTests/zcf/test-zoeHelpersWZcf.js
@@ -295,7 +295,6 @@ test(`zoeHelper with zcf - fit proposal patterns`, async t => {
     give: { B: simoleans(3n) },
   });
 
-  // @ts-expect-error invalid arguments for testing
   t.throws(() => fit(proposal, harden([])), {
     message: /.* - Must be equivalent to: \[\]/,
   });
@@ -624,6 +623,7 @@ test(`zcf/zoeHelper - assertProposalShape w/bad Expected`, async t => {
     { B: simoleanMint.mintPayment(simoleans(3n)) },
   );
 
+  // @ts-expect-error
   t.throws(() => assertProposalShape(zcfSeat, { give: { B: moola(3n) } }), {
     message: /The value of the expected record must be null but was .*/,
   });

diff --git a/packages/zoe/test/unitTests/zcf/zcfTesterContract.js b/packages/zoe/test/unitTests/zcf/zcfTesterContract.js
@@ -6,7 +6,7 @@ import { Far } from '@endo/far';
 /**
  * Tests ZCF
  *
- * @type {ContractStartFn<{makeInvitation: unknown}>}
+ * @param {ZCF} zcf
  */
 const start = async zcf => {
   // make the `zcf` and `instance` available to the tests

diff --git a/packages/zoe/test/unitTests/zoe/test-burnInvitation.js b/packages/zoe/test/unitTests/zoe/test-burnInvitation.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';

diff --git a/packages/zoe/test/unitTests/zoe/test-installationStorage.js b/packages/zoe/test/unitTests/zoe/test-installationStorage.js
@@ -1,4 +1,4 @@
-// @ts-check
+// @ts-nocheck
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';