chore: add globals to fix linting, switch ERTP to use the swingset pr…

…epare test env
Agoric · Mar 5, 2021 · 7f7d604 · 7f7d604
1 parent 582982b
commit 7f7d604
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 21 deletions.
diff --git a/packages/ERTP/globals.d.ts b/packages/ERTP/globals.d.ts
@@ -0,0 +1,2 @@
+declare var makeKind: function;
+declare var makeWeakStore: function;
diff --git a/packages/ERTP/jsconfig.json b/packages/ERTP/jsconfig.json
@@ -14,5 +14,5 @@
     "strictNullChecks": true,
     "moduleResolution": "node",
   },
-  "include": ["src/**/*.js", "exported.js"],
+  "include": ["src/**/*.js", "exported.js", "globals.d.ts"],
 }
diff --git a/packages/ERTP/src/issuer.js b/packages/ERTP/src/issuer.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-/* global makeWeakStore */
-
 import { assert, details as X } from '@agoric/assert';
 import { makeExternalStore } from '@agoric/store';
 import { E } from '@agoric/eventual-send';

diff --git a/packages/ERTP/src/payment.js b/packages/ERTP/src/payment.js
@@ -1,5 +1,3 @@
-/* global makeKind */
-
 // @ts-check
 
 import { Far } from '@agoric/marshal';

diff --git a/packages/ERTP/test/_setupFakeVirtualObjectManager.js b/packages/ERTP/test/_setupFakeVirtualObjectManager.js
diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js
@@ -1,3 +1,9 @@
+// @ts-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/swingset-vat/tools/prepare-test-env';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 import { Far } from '@agoric/marshal';
 import { makeAmountMath, MathKind } from '../../../src';

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js
@@ -1,3 +1,9 @@
+// @ts-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/swingset-vat/tools/prepare-test-env';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 import { Far, Data } from '@agoric/marshal';
 import { makeAmountMath, MathKind } from '../../../src';

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js
@@ -1,3 +1,9 @@
+// @ts-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/swingset-vat/tools/prepare-test-env';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 import { Far } from '@agoric/marshal';
 import { makeAmountMath, MathKind } from '../../../src';

diff --git a/packages/ERTP/test/unitTests/test-interfaces.js b/packages/ERTP/test/unitTests/test-interfaces.js
@@ -1,3 +1,8 @@
+// @ts-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/swingset-vat/tools/prepare-test-env';
+
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 import { getInterfaceOf } from '@agoric/marshal';

diff --git a/packages/ERTP/test/unitTests/test-issuerObj.js b/packages/ERTP/test/unitTests/test-issuerObj.js
@@ -1,4 +1,8 @@
 // @ts-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/swingset-vat/tools/prepare-test-env';
+
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 import { E } from '@agoric/eventual-send';

diff --git a/packages/ERTP/test/unitTests/test-mintObj.js b/packages/ERTP/test/unitTests/test-mintObj.js
@@ -1,7 +1,13 @@
+// @ts-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/swingset-vat/tools/prepare-test-env';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 
 import { Far } from '@agoric/marshal';
-// eslint-disable-next-line import/no-extraneous-dependencies
+
 import { makeIssuerKit, MathKind } from '../../src';
 
 test('mint.getIssuer', t => {

diff --git a/packages/eslint-config/eslint-config.json b/packages/eslint-config/eslint-config.json
@@ -16,7 +16,9 @@
     "harden": "readonly",
     "lockdown": "readonly",
     "Compartment": "readonly",
-    "StaticModuleRecord": "readonly"
+    "StaticModuleRecord": "readonly",
+    "makeKind": "readonly",
+    "makeWeakStore": "readonly"
   },
   "rules": {
     "quotes": [

diff --git a/packages/zoe/src/contractFacet/contractFacet.js b/packages/zoe/src/contractFacet/contractFacet.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-/* globals makeKind, makeWeakStore */
-
 // This is the Zoe contract facet. Each time we make a new instance of a
 // contract we will start by creating a new vat and running this code in it. In
 // order to install this code in a vat, Zoe needs to import a bundle containing

diff --git a/packages/zoe/src/zoeService/zoe.js b/packages/zoe/src/zoeService/zoe.js
@@ -1,4 +1,3 @@
-/* globals makeKind makeWeakStore */
 // @ts-check
 import { assert, details as X } from '@agoric/assert';
 import { E } from '@agoric/eventual-send';

diff --git a/packages/zoe/test/minimalMakeKindContract.js b/packages/zoe/test/minimalMakeKindContract.js
@@ -1,4 +1,4 @@
-const start = zcf => {
+const start = _zcf => {
   makeKind();
   makeWeakStore();
 

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

diff --git a/packages/zoe/test/unitTests/contractSupport/test-ratio.js b/packages/zoe/test/unitTests/contractSupport/test-ratio.js
@@ -1,6 +1,8 @@
 // @ts-check
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 import '../../../src/contractSupport/types';
 

diff --git a/packages/zoe/test/unitTests/contracts/test-autoswapPool.js b/packages/zoe/test/unitTests/contracts/test-autoswapPool.js
@@ -1,5 +1,6 @@
 // isolated unit test of price calculations in pool in multipoolAutoswap
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';

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

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

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

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

diff --git a/packages/zoe/test/unitTests/test-offerSafety.js b/packages/zoe/test/unitTests/test-offerSafety.js
@@ -1,6 +1,6 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-
 import '@agoric/zoe/tools/prepare-test-env';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 
 import { isOfferSafe } from '../../src/contractFacet/offerSafety';

diff --git a/packages/zoe/test/unitTests/test-zoe-env.js b/packages/zoe/test/unitTests/test-zoe-env.js
@@ -1,6 +1,7 @@
+// @ts-check
+
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@agoric/zoe/tools/prepare-test-env';
-/* global makeKind, makeWeakStore */
 // eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
 

diff --git a/packages/zoe/tools/prepare-test-env.js b/packages/zoe/tools/prepare-test-env.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * Prepare global environment for zoe tests.
  *
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		declare var makeKind: function;
		declare var makeWeakStore: function;