From 27eb8aaf1aa02d76281072285a854f83a8dc0f41 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 3 Nov 2022 13:52:47 -0700 Subject: [PATCH 1/8] chore: checkJs casting --- packages/casting/jsconfig.json | 8 +------- packages/casting/src/casting-spec.js | 1 - packages/casting/src/follower-cosmjs.js | 12 +++++------- packages/casting/src/leader-netconfig.js | 1 - patches/encoding+0.1.13.patch | 9 +++++++++ patches/node-fetch+2.6.7.patch | 11 ++++++++--- 6 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 patches/encoding+0.1.13.patch diff --git a/packages/casting/jsconfig.json b/packages/casting/jsconfig.json index 1dc50dd301c6..574efb7853d3 100644 --- a/packages/casting/jsconfig.json +++ b/packages/casting/jsconfig.json @@ -3,14 +3,8 @@ "compilerOptions": { "target": "esnext", "module": "esnext", - + "checkJs": true, "noEmit": true, -/* - // The following flags are for creating .d.ts files: - "noEmit": false, - "declaration": true, - "emitDeclarationOnly": true, -*/ "downlevelIteration": true, "strictNullChecks": true, "moduleResolution": "node", diff --git a/packages/casting/src/casting-spec.js b/packages/casting/src/casting-spec.js index f3e4db13426f..6f0e656a099a 100644 --- a/packages/casting/src/casting-spec.js +++ b/packages/casting/src/casting-spec.js @@ -123,4 +123,3 @@ export const makeCastingSpec = async sourceP => { } assert.fail(`CastingSpec ${spec} is not a string, object, or ref`); }; -/** @typedef {ReturnType} CastingSpec */ diff --git a/packages/casting/src/follower-cosmjs.js b/packages/casting/src/follower-cosmjs.js index cf6364500496..d0f6ca5dbb38 100644 --- a/packages/casting/src/follower-cosmjs.js +++ b/packages/casting/src/follower-cosmjs.js @@ -15,9 +15,7 @@ const { Tendermint34Client } = tendermintRpcStar; const { details: X, quote: q } = assert; const textDecoder = new TextDecoder(); -/** @template T @typedef {import('./types.js').StreamCell} StreamCell */ -/** @template T @typedef {import('./types.js').ValueFollowerElement} ValueFollowerElement */ -/** @template T @typedef {import('./types.js').Follower>} ValueFollower */ +/** @template T @typedef {import('./types.js').Follower>} ValueFollower */ /** * This is an imperfect heuristic to navigate the migration from value cells to @@ -341,7 +339,7 @@ export const makeCosmjsFollower = ( * @param {any} data * @param {number} blockHeight * @param {number} currentBlockHeight - * @returns {Promise>} + * @returns {Promise>} */ const followerElementFromStreamCellValue = async ( data, @@ -356,7 +354,7 @@ export const makeCosmjsFollower = ( }; /** - * @param {StreamCell} streamCell + * @param {import('./types.js').StreamCell} streamCell * @param {number} currentBlockHeight * @yields {ValueFollowerElement} */ @@ -371,7 +369,7 @@ export const makeCosmjsFollower = ( } /** - * @param {StreamCell} streamCell + * @param {import('./types.js').StreamCell} streamCell * @param {number} currentBlockHeight * @yields {ValueFollowerElement} */ @@ -386,7 +384,7 @@ export const makeCosmjsFollower = ( } /** - * @param {StreamCell} streamCell + * @param {import('./types.js').StreamCell} streamCell * @param {number} currentBlockHeight * @yields {ValueFollowerElement} */ diff --git a/packages/casting/src/leader-netconfig.js b/packages/casting/src/leader-netconfig.js index f74a1ed4b27d..e8318b2292db 100644 --- a/packages/casting/src/leader-netconfig.js +++ b/packages/casting/src/leader-netconfig.js @@ -80,4 +80,3 @@ export const makeLeader = (bootstrap = DEFAULT_BOOTSTRAP, options) => { } return makeLeaderFromRpcAddresses([bootstrap], options); }; -/** @typedef {ReturnType} Leader */ diff --git a/patches/encoding+0.1.13.patch b/patches/encoding+0.1.13.patch new file mode 100644 index 000000000000..d0db590696a3 --- /dev/null +++ b/patches/encoding+0.1.13.patch @@ -0,0 +1,9 @@ +diff --git a/node_modules/encoding/lib/encoding.js b/node_modules/encoding/lib/encoding.js +index 865c24b..f93d37a 100644 +--- a/node_modules/encoding/lib/encoding.js ++++ b/node_modules/encoding/lib/encoding.js +@@ -1,3 +1,4 @@ ++// @ts-nocheck + 'use strict'; + + var iconvLite = require('iconv-lite'); diff --git a/patches/node-fetch+2.6.7.patch b/patches/node-fetch+2.6.7.patch index aa68036c8c7b..9f31f9c5ed52 100644 --- a/patches/node-fetch+2.6.7.patch +++ b/patches/node-fetch+2.6.7.patch @@ -1,8 +1,13 @@ diff --git a/node_modules/node-fetch/lib/index.js b/node_modules/node-fetch/lib/index.js -index e5b04f1..a050074 100644 +index e5b04f1..a794a8c 100644 --- a/node_modules/node-fetch/lib/index.js +++ b/node_modules/node-fetch/lib/index.js -@@ -154,9 +154,23 @@ function FetchError(message, type, systemError) { +@@ -1,3 +1,4 @@ ++// @ts-nocheck + 'use strict'; + + Object.defineProperty(exports, '__esModule', { value: true }); +@@ -154,9 +155,23 @@ function FetchError(message, type, systemError) { Error.captureStackTrace(this, this.constructor); } @@ -29,7 +34,7 @@ index e5b04f1..a050074 100644 let convert; try { -@@ -1400,10 +1414,7 @@ function AbortError(message) { +@@ -1400,10 +1415,7 @@ function AbortError(message) { // hide custom error implementation details from end-users Error.captureStackTrace(this, this.constructor); } From 01ea5b66025ebe806b6b37ded5b1819e060dd9d2 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 8 Nov 2022 14:03:36 -0800 Subject: [PATCH 2/8] chore: add @typs/node-fetch dep --- packages/casting/node-fetch-shim.js | 1 + packages/casting/package.json | 1 + yarn.lock | 85 +++++++++++++++++------------ 3 files changed, 53 insertions(+), 34 deletions(-) diff --git a/packages/casting/node-fetch-shim.js b/packages/casting/node-fetch-shim.js index c444f9ab9d77..742ccdea1385 100644 --- a/packages/casting/node-fetch-shim.js +++ b/packages/casting/node-fetch-shim.js @@ -1,4 +1,5 @@ /* global globalThis */ import fetch from 'node-fetch'; +// @ts-expect-error node-fetch does not exactly match W3C Fetch globalThis.fetch = fetch; diff --git a/packages/casting/package.json b/packages/casting/package.json index 24bd568f27e3..4dcf8c309779 100644 --- a/packages/casting/package.json +++ b/packages/casting/package.json @@ -36,6 +36,7 @@ }, "devDependencies": { "@endo/ses-ava": "^0.2.35", + "@types/node-fetch": "^2.6.2", "ava": "^5.0.1", "c8": "^7.7.2", "express": "^4.17.1", diff --git a/yarn.lock b/yarn.lock index 03be8fa25e84..e01bd8791eb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3177,6 +3177,14 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323" integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw== +"@types/node-fetch@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" + integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*", "@types/node@>= 8", "@types/node@>=13.7.0", "@types/node@^16.7.10": version "16.7.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc" @@ -3344,13 +3352,13 @@ "@typescript-eslint/types" "5.33.0" "@typescript-eslint/visitor-keys" "5.33.0" -"@typescript-eslint/scope-manager@5.42.0": - version "5.42.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz#e1f2bb26d3b2a508421ee2e3ceea5396b192f5ef" - integrity sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow== +"@typescript-eslint/scope-manager@5.42.1": + version "5.42.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz#05e5e1351485637d466464237e5259b49f609b18" + integrity sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ== dependencies: - "@typescript-eslint/types" "5.42.0" - "@typescript-eslint/visitor-keys" "5.42.0" + "@typescript-eslint/types" "5.42.1" + "@typescript-eslint/visitor-keys" "5.42.1" "@typescript-eslint/type-utils@5.33.0": version "5.33.0" @@ -3366,10 +3374,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz#d41c584831805554b063791338b0220b613a275b" integrity sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw== -"@typescript-eslint/types@5.42.0": - version "5.42.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.0.tgz#5aeff9b5eced48f27d5b8139339bf1ef805bad7a" - integrity sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw== +"@typescript-eslint/types@5.42.1": + version "5.42.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.1.tgz#0d4283c30e9b70d2aa2391c36294413de9106df2" + integrity sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA== "@typescript-eslint/typescript-estree@5.33.0": version "5.33.0" @@ -3384,13 +3392,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.42.0": - version "5.42.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz#2592d24bb5f89bf54a63384ff3494870f95b3fd8" - integrity sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg== +"@typescript-eslint/typescript-estree@5.42.1": + version "5.42.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz#f9a223ecb547a781d37e07a5ac6ba9ff681eaef0" + integrity sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw== dependencies: - "@typescript-eslint/types" "5.42.0" - "@typescript-eslint/visitor-keys" "5.42.0" + "@typescript-eslint/types" "5.42.1" + "@typescript-eslint/visitor-keys" "5.42.1" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -3410,15 +3418,15 @@ eslint-utils "^3.0.0" "@typescript-eslint/utils@^5.10.0": - version "5.42.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.42.0.tgz#f06bd43b9a9a06ed8f29600273240e84a53f2f15" - integrity sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ== + version "5.42.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.42.1.tgz#2789b1cd990f0c07aaa3e462dbe0f18d736d5071" + integrity sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ== dependencies: "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.42.0" - "@typescript-eslint/types" "5.42.0" - "@typescript-eslint/typescript-estree" "5.42.0" + "@typescript-eslint/scope-manager" "5.42.1" + "@typescript-eslint/types" "5.42.1" + "@typescript-eslint/typescript-estree" "5.42.1" eslint-scope "^5.1.1" eslint-utils "^3.0.0" semver "^7.3.7" @@ -3431,12 +3439,12 @@ "@typescript-eslint/types" "5.33.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@5.42.0": - version "5.42.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz#ee8d62d486f41cfe646632fab790fbf0c1db5bb0" - integrity sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg== +"@typescript-eslint/visitor-keys@5.42.1": + version "5.42.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz#df10839adf6605e1cdb79174cf21e46df9be4872" + integrity sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A== dependencies: - "@typescript-eslint/types" "5.42.0" + "@typescript-eslint/types" "5.42.1" eslint-visitor-keys "^3.3.0" "@web/browser-logs@^0.2.1", "@web/browser-logs@^0.2.2": @@ -3665,16 +3673,16 @@ acorn-walk@^8.2.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^7.4.0, acorn@^8.2.4, acorn@^8.7.1: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -acorn@^8.8.0: +acorn@^7.4.0, acorn@^8.7.1, acorn@^8.8.0: version "8.8.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== +acorn@^8.2.4: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + agent-base@4, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -4953,7 +4961,7 @@ columnify@^1.5.4: strip-ansi "^3.0.0" wcwidth "^1.0.0" -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -6868,6 +6876,15 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" From b82f3c6de1e1c2e05bac863c791c38fc2f0fd945 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 8 Nov 2022 14:04:29 -0800 Subject: [PATCH 3/8] chore: forward acorn patch --- .../{acorn+8.7.1.patch => acorn+8.8.1.patch} | 4 ++-- yarn.lock | 18 ++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) rename patches/{acorn+8.7.1.patch => acorn+8.8.1.patch} (91%) diff --git a/patches/acorn+8.7.1.patch b/patches/acorn+8.8.1.patch similarity index 91% rename from patches/acorn+8.7.1.patch rename to patches/acorn+8.8.1.patch index 3eb10c63d341..db673e49ccf6 100644 --- a/patches/acorn+8.7.1.patch +++ b/patches/acorn+8.8.1.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/acorn/dist/acorn.js b/node_modules/acorn/dist/acorn.js -index 1ccee20..cc7ce99 100644 +index 5a291db..f0cb869 100644 --- a/node_modules/acorn/dist/acorn.js +++ b/node_modules/acorn/dist/acorn.js -@@ -2133,7 +2133,7 @@ +@@ -2138,7 +2138,7 @@ if (checkClashes) { if (hasOwn(checkClashes, expr.name)) { this.raiseRecoverable(expr.start, "Argument name clash"); } diff --git a/yarn.lock b/yarn.lock index e01bd8791eb5..da3c7f03e05f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3405,7 +3405,7 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.33.0", "@typescript-eslint/utils@^5.10.2": +"@typescript-eslint/utils@5.33.0": version "5.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.0.tgz#46797461ce3146e21c095d79518cc0f8ec574038" integrity sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw== @@ -3417,7 +3417,7 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/utils@^5.10.0": +"@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.10.2": version "5.42.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.42.1.tgz#2789b1cd990f0c07aaa3e462dbe0f18d736d5071" integrity sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ== @@ -3673,16 +3673,11 @@ acorn-walk@^8.2.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^7.4.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^7.4.0, acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.0: version "8.8.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== -acorn@^8.2.4: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - agent-base@4, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -3832,12 +3827,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansi-styles@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3" - integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ== - -ansi-styles@^6.1.1: +ansi-styles@^6.0.0, ansi-styles@^6.1.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== From e8b8730308604ed32bce8b220a91f11f649015b1 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 3 Nov 2022 14:23:08 -0700 Subject: [PATCH 4/8] chore: checkJs deploy-script-support --- packages/deploy-script-support/jsconfig.json | 8 +------- packages/deploy-script-support/src/assertOfferResult.js | 1 - packages/deploy-script-support/src/code-gen.js | 1 - .../deploy-script-support/src/coreProposalBehavior.js | 2 +- packages/deploy-script-support/src/depositInvitation.js | 2 -- .../deploy-script-support/src/endo-pieces-contract.js | 1 - packages/deploy-script-support/src/extract-proposal.js | 1 - packages/deploy-script-support/src/getBundlerMaker.js | 1 - packages/deploy-script-support/src/helpers.js | 1 - packages/deploy-script-support/src/install.js | 2 -- packages/deploy-script-support/src/installInPieces.js | 1 - packages/deploy-script-support/src/offer.js | 2 -- packages/deploy-script-support/src/saveIssuer.js | 2 -- packages/deploy-script-support/src/startInstance.js | 2 -- packages/deploy-script-support/src/writeCoreProposal.js | 1 - .../test/unitTests/test-assertOfferResult.js | 1 - .../test/unitTests/test-coreProposalBehavior.js | 1 + .../test/unitTests/test-depositInvitation.js | 1 - .../test/unitTests/test-getBundlerMaker.js | 1 + .../deploy-script-support/test/unitTests/test-install.js | 1 - .../deploy-script-support/test/unitTests/test-offer.js | 1 - .../test/unitTests/test-startInstance.js | 1 - 22 files changed, 4 insertions(+), 31 deletions(-) diff --git a/packages/deploy-script-support/jsconfig.json b/packages/deploy-script-support/jsconfig.json index 5a183cba8519..6de2c49ef46d 100644 --- a/packages/deploy-script-support/jsconfig.json +++ b/packages/deploy-script-support/jsconfig.json @@ -3,14 +3,8 @@ "compilerOptions": { "target": "esnext", "module": "esnext", - + "checkJs": true, "noEmit": true, -/* - // The following flags are for creating .d.ts files: - "noEmit": false, - "declaration": true, - "emitDeclarationOnly": true, -*/ "downlevelIteration": true, "strictNullChecks": true, "moduleResolution": "node", diff --git a/packages/deploy-script-support/src/assertOfferResult.js b/packages/deploy-script-support/src/assertOfferResult.js index ee5fda343b80..dcda189d4a3b 100644 --- a/packages/deploy-script-support/src/assertOfferResult.js +++ b/packages/deploy-script-support/src/assertOfferResult.js @@ -1,4 +1,3 @@ -// @ts-check import { assert, details as X } from '@agoric/assert'; import { E } from '@endo/far'; diff --git a/packages/deploy-script-support/src/code-gen.js b/packages/deploy-script-support/src/code-gen.js index 521211f3d469..a5ffddd7d1d1 100644 --- a/packages/deploy-script-support/src/code-gen.js +++ b/packages/deploy-script-support/src/code-gen.js @@ -1,4 +1,3 @@ -// @ts-check import { makeMarshal } from '@endo/marshal'; import { decodeToJustin } from '@endo/marshal/src/marshal-justin.js'; diff --git a/packages/deploy-script-support/src/coreProposalBehavior.js b/packages/deploy-script-support/src/coreProposalBehavior.js index 143b5d9d4743..ba14be0400b1 100644 --- a/packages/deploy-script-support/src/coreProposalBehavior.js +++ b/packages/deploy-script-support/src/coreProposalBehavior.js @@ -47,7 +47,7 @@ export const makeCoreProposalBehavior = ({ return fromEntries(ents); }; - /** @param {ChainBootstrapSpace} allPowers */ + /** @param {ChainBootstrapSpace & BootstrapPowers & { evaluateInstallation: any }} allPowers */ const behavior = async allPowers => { const { consume: { board, agoricNamesAdmin }, diff --git a/packages/deploy-script-support/src/depositInvitation.js b/packages/deploy-script-support/src/depositInvitation.js index aedfe2ab9c4f..f03d1a95442d 100644 --- a/packages/deploy-script-support/src/depositInvitation.js +++ b/packages/deploy-script-support/src/depositInvitation.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/far'; /** diff --git a/packages/deploy-script-support/src/endo-pieces-contract.js b/packages/deploy-script-support/src/endo-pieces-contract.js index dcb36899dcaa..7ecc4999321b 100644 --- a/packages/deploy-script-support/src/endo-pieces-contract.js +++ b/packages/deploy-script-support/src/endo-pieces-contract.js @@ -1,4 +1,3 @@ -// @ts-check import { E, Far } from '@endo/far'; import { encodeBase64, decodeBase64 } from '@endo/base64'; import { ZipWriter } from '@endo/zip'; diff --git a/packages/deploy-script-support/src/extract-proposal.js b/packages/deploy-script-support/src/extract-proposal.js index 7549115e2630..a5d78e7a08de 100644 --- a/packages/deploy-script-support/src/extract-proposal.js +++ b/packages/deploy-script-support/src/extract-proposal.js @@ -1,4 +1,3 @@ -// @ts-check import fs from 'fs'; import { createRequire } from 'module'; import path from 'path'; diff --git a/packages/deploy-script-support/src/getBundlerMaker.js b/packages/deploy-script-support/src/getBundlerMaker.js index e52c9e397cdc..a14c5811ab5b 100644 --- a/packages/deploy-script-support/src/getBundlerMaker.js +++ b/packages/deploy-script-support/src/getBundlerMaker.js @@ -1,4 +1,3 @@ -// @ts-check /** * This helper mainly exists to bridge the gaps that would be filled by * bundlecap support. It will probably go away after bundlecap support is diff --git a/packages/deploy-script-support/src/helpers.js b/packages/deploy-script-support/src/helpers.js index 1d506baa365c..fe00f76324a7 100644 --- a/packages/deploy-script-support/src/helpers.js +++ b/packages/deploy-script-support/src/helpers.js @@ -1,4 +1,3 @@ -// @ts-check import '@agoric/zoe/exported.js'; import { E } from '@endo/far'; diff --git a/packages/deploy-script-support/src/install.js b/packages/deploy-script-support/src/install.js index b7a661fa7d65..507c41a14b58 100644 --- a/packages/deploy-script-support/src/install.js +++ b/packages/deploy-script-support/src/install.js @@ -1,5 +1,3 @@ -// @ts-check - import './externalTypes.js'; import { E } from '@endo/far'; diff --git a/packages/deploy-script-support/src/installInPieces.js b/packages/deploy-script-support/src/installInPieces.js index 7d62e9f98e2c..2cf8b9f3d5d3 100644 --- a/packages/deploy-script-support/src/installInPieces.js +++ b/packages/deploy-script-support/src/installInPieces.js @@ -1,4 +1,3 @@ -// @ts-check import { E } from '@endo/far'; import { ZipReader } from '@endo/zip'; import { encodeBase64, decodeBase64 } from '@endo/base64'; diff --git a/packages/deploy-script-support/src/offer.js b/packages/deploy-script-support/src/offer.js index 3830c8abe295..84de3e039ac3 100644 --- a/packages/deploy-script-support/src/offer.js +++ b/packages/deploy-script-support/src/offer.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/far'; import { assert } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/deploy-script-support/src/saveIssuer.js b/packages/deploy-script-support/src/saveIssuer.js index 507138543f64..9c517145b927 100644 --- a/packages/deploy-script-support/src/saveIssuer.js +++ b/packages/deploy-script-support/src/saveIssuer.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/far'; /** diff --git a/packages/deploy-script-support/src/startInstance.js b/packages/deploy-script-support/src/startInstance.js index 4011eaafcfb1..428ce798e478 100644 --- a/packages/deploy-script-support/src/startInstance.js +++ b/packages/deploy-script-support/src/startInstance.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert } from '@agoric/assert'; import { E, passStyleOf } from '@endo/far'; diff --git a/packages/deploy-script-support/src/writeCoreProposal.js b/packages/deploy-script-support/src/writeCoreProposal.js index 0c535ea37eb6..65867347e07d 100644 --- a/packages/deploy-script-support/src/writeCoreProposal.js +++ b/packages/deploy-script-support/src/writeCoreProposal.js @@ -1,4 +1,3 @@ -// @ts-check import fs from 'fs'; import { E } from '@endo/far'; diff --git a/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js b/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js index 20ca24c3b25f..af5421af9861 100644 --- a/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js +++ b/packages/deploy-script-support/test/unitTests/test-assertOfferResult.js @@ -1,4 +1,3 @@ -// @ts-check import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js'; import { assertOfferResult } from '../../src/assertOfferResult.js'; diff --git a/packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js b/packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js index f294921526f4..c18d4252af98 100644 --- a/packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js +++ b/packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js @@ -10,6 +10,7 @@ import { makeCoreProposalBehavior } from '../../src/coreProposalBehavior.js'; test('coreProposalBehavior', async t => { const manifestInstallRef = 'manifestInstallRef'; + /** @type {[string, ...unknown[]]} */ const getManifestCall = ['getManifestForTest', 'arg1', 'arg2']; const behavior = makeCoreProposalBehavior({ E, diff --git a/packages/deploy-script-support/test/unitTests/test-depositInvitation.js b/packages/deploy-script-support/test/unitTests/test-depositInvitation.js index 922265fa33c5..aa633b5dfc6f 100644 --- a/packages/deploy-script-support/test/unitTests/test-depositInvitation.js +++ b/packages/deploy-script-support/test/unitTests/test-depositInvitation.js @@ -1,4 +1,3 @@ -// @ts-check import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp'; diff --git a/packages/deploy-script-support/test/unitTests/test-getBundlerMaker.js b/packages/deploy-script-support/test/unitTests/test-getBundlerMaker.js index 54bc7ae6954d..4114e1212117 100644 --- a/packages/deploy-script-support/test/unitTests/test-getBundlerMaker.js +++ b/packages/deploy-script-support/test/unitTests/test-getBundlerMaker.js @@ -10,6 +10,7 @@ test('getBundlerMaker - already made', async t => { t.deepEqual(path, ['scratch', 'bundlerMaker']); return 'BUNDLER_MAKER_FOUND'; }; + // @ts-expect-error omitting args for test const getBundlerMaker = makeGetBundlerMaker({}, { lookup }); const bundler = await getBundlerMaker({ log: t.log }); diff --git a/packages/deploy-script-support/test/unitTests/test-install.js b/packages/deploy-script-support/test/unitTests/test-install.js index 4beaeb72ac71..7b5d0ecdcff9 100644 --- a/packages/deploy-script-support/test/unitTests/test-install.js +++ b/packages/deploy-script-support/test/unitTests/test-install.js @@ -1,4 +1,3 @@ -// @ts-check import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeZoeKit } from '@agoric/zoe'; diff --git a/packages/deploy-script-support/test/unitTests/test-offer.js b/packages/deploy-script-support/test/unitTests/test-offer.js index bf5b0a96392e..6350fef9cbc4 100644 --- a/packages/deploy-script-support/test/unitTests/test-offer.js +++ b/packages/deploy-script-support/test/unitTests/test-offer.js @@ -1,4 +1,3 @@ -// @ts-check import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeZoeKit } from '@agoric/zoe'; diff --git a/packages/deploy-script-support/test/unitTests/test-startInstance.js b/packages/deploy-script-support/test/unitTests/test-startInstance.js index fd048dcb50f7..702591c92238 100644 --- a/packages/deploy-script-support/test/unitTests/test-startInstance.js +++ b/packages/deploy-script-support/test/unitTests/test-startInstance.js @@ -1,4 +1,3 @@ -// @ts-check import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeZoeKit } from '@agoric/zoe'; From 5a150c66e1a29be96e6969556dd70e7f76cf7e52 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 8 Nov 2022 14:09:03 -0800 Subject: [PATCH 5/8] chore: ts-ignore for cross-package --- packages/SwingSet/src/lib/storageAPI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SwingSet/src/lib/storageAPI.js b/packages/SwingSet/src/lib/storageAPI.js index d6307a335504..a3bc9940924b 100644 --- a/packages/SwingSet/src/lib/storageAPI.js +++ b/packages/SwingSet/src/lib/storageAPI.js @@ -163,7 +163,8 @@ export function makeBufferedStorage(kvStore, listeners = {}) { if (additions.has(key)) return additions.get(key); if (deletions.has(key)) return undefined; const value = kvStore.get(key); - // @ts-expect-error value may be undefined + // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 + // @ts-ignore value may be undefined if (onGet !== undefined) onGet(key, value); return value; }, From 4f258a5fadc4983701a7ced49d568d380814ca79 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 3 Nov 2022 14:27:34 -0700 Subject: [PATCH 6/8] chore: checkJs governance --- packages/governance/jsconfig.json | 1 + packages/governance/src/binaryVoteCounter.js | 2 -- packages/governance/src/closingRule.js | 2 -- packages/governance/src/committee.js | 2 -- packages/governance/src/contractGovernance/assertions.js | 2 -- packages/governance/src/contractGovernance/governApi.js | 2 -- packages/governance/src/contractGovernance/governFilter.js | 2 -- packages/governance/src/contractGovernance/governParam.js | 2 -- packages/governance/src/contractGovernance/paramManager.js | 2 -- .../governance/src/contractGovernance/typedParamManager.js | 2 -- packages/governance/src/contractGovernor.js | 2 -- packages/governance/src/contractHelper.js | 2 -- packages/governance/src/electorateTools.js | 2 -- packages/governance/src/index.js | 3 +-- packages/governance/src/noActionElectorate.js | 2 -- packages/governance/src/question.js | 2 -- packages/governance/src/typeGuards.js | 2 -- packages/governance/src/types.js | 2 -- packages/governance/src/validators.js | 2 -- .../governance/test/swingsetTests/committeeBinary/bootstrap.js | 2 -- .../test/swingsetTests/committeeBinary/test-committee.js | 2 -- .../governance/test/swingsetTests/committeeBinary/vat-voter.js | 2 -- .../governance/test/swingsetTests/committeeBinary/vat-zoe.js | 2 -- .../test/swingsetTests/contractGovernor/bootstrap.js | 2 -- .../test/swingsetTests/contractGovernor/governedContract.js | 2 -- .../test/swingsetTests/contractGovernor/test-governor.js | 2 -- .../test/swingsetTests/contractGovernor/vat-voter.js | 2 -- .../governance/test/swingsetTests/contractGovernor/vat-zoe.js | 2 -- packages/governance/test/unitTests/test-ballotBuilder.js | 2 -- packages/governance/test/unitTests/test-ballotCount.js | 2 -- packages/governance/test/unitTests/test-committee.js | 2 -- .../governance/test/unitTests/test-paramChangePositions.js | 2 -- packages/governance/test/unitTests/test-paramGovernance.js | 2 -- packages/governance/test/unitTests/test-typedParamManager.js | 2 -- 34 files changed, 2 insertions(+), 66 deletions(-) diff --git a/packages/governance/jsconfig.json b/packages/governance/jsconfig.json index b20f9e32fddb..858ad6a85b13 100644 --- a/packages/governance/jsconfig.json +++ b/packages/governance/jsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "target": "esnext", "module": "esnext", + "checkJs": true, "noEmit": true, "downlevelIteration": true, "strictNullChecks": true, diff --git a/packages/governance/src/binaryVoteCounter.js b/packages/governance/src/binaryVoteCounter.js index f809874f9ef5..bd62a44ef6ed 100644 --- a/packages/governance/src/binaryVoteCounter.js +++ b/packages/governance/src/binaryVoteCounter.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makePromiseKit } from '@endo/promise-kit'; import { makeHeapFarInstance, keyEQ, makeStore } from '@agoric/store'; diff --git a/packages/governance/src/closingRule.js b/packages/governance/src/closingRule.js index faaf0bcf5d14..7d7252a96bc5 100644 --- a/packages/governance/src/closingRule.js +++ b/packages/governance/src/closingRule.js @@ -1,5 +1,3 @@ -// @ts-check - // Standard closing rule is a deadline and Timer. An alternative might allow for // emergency votes that can close as soon as a quorum or other threshold is // reached. diff --git a/packages/governance/src/committee.js b/packages/governance/src/committee.js index 80f9fb19449c..ebcf720b3c22 100644 --- a/packages/governance/src/committee.js +++ b/packages/governance/src/committee.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeStoredPublishKit } from '@agoric/notifier'; import { makeStore, makeHeapFarInstance, M } from '@agoric/store'; import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/governance/src/contractGovernance/assertions.js b/packages/governance/src/contractGovernance/assertions.js index 29ccce4abfcc..b0b1f84cb018 100644 --- a/packages/governance/src/contractGovernance/assertions.js +++ b/packages/governance/src/contractGovernance/assertions.js @@ -1,5 +1,3 @@ -// @ts-check - import { isRemotable } from '@endo/marshal'; import { assertIsRatio } from '@agoric/zoe/src/contractSupport/ratio.js'; diff --git a/packages/governance/src/contractGovernance/governApi.js b/packages/governance/src/contractGovernance/governApi.js index a557f9ce049a..c8f913c44d4e 100644 --- a/packages/governance/src/contractGovernance/governApi.js +++ b/packages/governance/src/contractGovernance/governApi.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { keyEQ } from '@agoric/store'; diff --git a/packages/governance/src/contractGovernance/governFilter.js b/packages/governance/src/contractGovernance/governFilter.js index aecc47f23e46..8f1e109397fe 100644 --- a/packages/governance/src/contractGovernance/governFilter.js +++ b/packages/governance/src/contractGovernance/governFilter.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { fit, keyEQ } from '@agoric/store'; diff --git a/packages/governance/src/contractGovernance/governParam.js b/packages/governance/src/contractGovernance/governParam.js index 55d3aa6a70ed..b01090f108fb 100644 --- a/packages/governance/src/contractGovernance/governParam.js +++ b/packages/governance/src/contractGovernance/governParam.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { deeplyFulfilled, Far } from '@endo/marshal'; import { fit, keyEQ } from '@agoric/store'; diff --git a/packages/governance/src/contractGovernance/paramManager.js b/packages/governance/src/contractGovernance/paramManager.js index b3ea9f19e284..728a3b7e4ec9 100644 --- a/packages/governance/src/contractGovernance/paramManager.js +++ b/packages/governance/src/contractGovernance/paramManager.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far, passStyleOf } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js'; diff --git a/packages/governance/src/contractGovernance/typedParamManager.js b/packages/governance/src/contractGovernance/typedParamManager.js index b9bf27829f74..c5fb10eca832 100644 --- a/packages/governance/src/contractGovernance/typedParamManager.js +++ b/packages/governance/src/contractGovernance/typedParamManager.js @@ -1,5 +1,3 @@ -// @ts-check - import { ParamTypes } from '../constants.js'; import { CONTRACT_ELECTORATE } from './governParam.js'; import { makeParamManagerBuilder } from './paramManager.js'; diff --git a/packages/governance/src/contractGovernor.js b/packages/governance/src/contractGovernor.js index 39f28eba980e..222d9f625ac5 100644 --- a/packages/governance/src/contractGovernor.js +++ b/packages/governance/src/contractGovernor.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { fit } from '@agoric/store'; diff --git a/packages/governance/src/contractHelper.js b/packages/governance/src/contractHelper.js index 9d8b4853557a..b293d4fd1180 100644 --- a/packages/governance/src/contractHelper.js +++ b/packages/governance/src/contractHelper.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeStoredPublisherKit } from '@agoric/notifier'; import { getMethodNames, objectMap } from '@agoric/internal'; diff --git a/packages/governance/src/electorateTools.js b/packages/governance/src/electorateTools.js index be9db4e1d2f4..881756a8c323 100644 --- a/packages/governance/src/electorateTools.js +++ b/packages/governance/src/electorateTools.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { deeplyFulfilled, Far } from '@endo/marshal'; diff --git a/packages/governance/src/index.js b/packages/governance/src/index.js index 1d3a1bc433b2..742497bcbaaf 100644 --- a/packages/governance/src/index.js +++ b/packages/governance/src/index.js @@ -1,6 +1,5 @@ -// @ts-check - import './types.js'; +import '@agoric/vats/src/core/types.js'; export { ChoiceMethod, diff --git a/packages/governance/src/noActionElectorate.js b/packages/governance/src/noActionElectorate.js index aea932adc1eb..dcfca6540b82 100644 --- a/packages/governance/src/noActionElectorate.js +++ b/packages/governance/src/noActionElectorate.js @@ -1,5 +1,3 @@ -// @ts-check - import { makePublishKit } from '@agoric/notifier'; import { makePromiseKit } from '@endo/promise-kit'; import { makeHeapFarInstance } from '@agoric/store'; diff --git a/packages/governance/src/question.js b/packages/governance/src/question.js index 29cb2977f56a..aa9b7bdb6a4d 100644 --- a/packages/governance/src/question.js +++ b/packages/governance/src/question.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeHeapFarInstance, fit, keyEQ, M } from '@agoric/store'; import { makeHandle } from '@agoric/zoe/src/makeHandle.js'; diff --git a/packages/governance/src/typeGuards.js b/packages/governance/src/typeGuards.js index 104ff5dec0fb..a71a8f397db8 100644 --- a/packages/governance/src/typeGuards.js +++ b/packages/governance/src/typeGuards.js @@ -1,5 +1,3 @@ -// @ts-check - import { M } from '@agoric/store'; import { TimestampShape } from '@agoric/swingset-vat/src/vats/timer/typeGuards.js'; import { diff --git a/packages/governance/src/types.js b/packages/governance/src/types.js index ffc1506cae2b..db3b922495e3 100644 --- a/packages/governance/src/types.js +++ b/packages/governance/src/types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * @typedef { 'unranked' | 'order' } ChoiceMethod * * UNRANKED: "unranked voting" means that the voter specifies some number of diff --git a/packages/governance/src/validators.js b/packages/governance/src/validators.js index dba50679d5d8..52c925e768f0 100644 --- a/packages/governance/src/validators.js +++ b/packages/governance/src/validators.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; const { details: X, quote: q } = assert; diff --git a/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js b/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js index ca6f1e934c7b..75d51c63c88b 100644 --- a/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js +++ b/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { makeBoard } from '@agoric/vats/src/lib-board.js'; diff --git a/packages/governance/test/swingsetTests/committeeBinary/test-committee.js b/packages/governance/test/swingsetTests/committeeBinary/test-committee.js index 3f429148bfbd..3f13d1c3b8bb 100644 --- a/packages/governance/test/swingsetTests/committeeBinary/test-committee.js +++ b/packages/governance/test/swingsetTests/committeeBinary/test-committee.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import '@endo/init/debug.js'; import test from 'ava'; diff --git a/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js b/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js index 5a4112d32754..645b169d9795 100644 --- a/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js +++ b/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeNotifierFromSubscriber, observeNotifier } from '@agoric/notifier'; import { keyEQ } from '@agoric/store'; import { E } from '@endo/eventual-send'; diff --git a/packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js b/packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js index e3adb132a79f..075f74c1b40f 100644 --- a/packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js +++ b/packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '@agoric/zoe'; diff --git a/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js b/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js index 00e29204bc05..0f514bef0bb3 100644 --- a/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js +++ b/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import buildManualTimer from '@agoric/zoe/tools/manualTimer.js'; diff --git a/packages/governance/test/swingsetTests/contractGovernor/governedContract.js b/packages/governance/test/swingsetTests/contractGovernor/governedContract.js index bb943bd6d436..1f483dd2b5e3 100644 --- a/packages/governance/test/swingsetTests/contractGovernor/governedContract.js +++ b/packages/governance/test/swingsetTests/contractGovernor/governedContract.js @@ -1,5 +1,3 @@ -// @ts-check - import { handleParamGovernance } from '../../../src/contractHelper.js'; import { ParamTypes } from '../../../src/index.js'; import { CONTRACT_ELECTORATE } from '../../../src/contractGovernance/governParam.js'; diff --git a/packages/governance/test/swingsetTests/contractGovernor/test-governor.js b/packages/governance/test/swingsetTests/contractGovernor/test-governor.js index 339cee6f0fae..0c0449db8294 100644 --- a/packages/governance/test/swingsetTests/contractGovernor/test-governor.js +++ b/packages/governance/test/swingsetTests/contractGovernor/test-governor.js @@ -1,5 +1,3 @@ -// @ts-check - import '@endo/init/debug.js'; // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js'; diff --git a/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js b/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js index 5c1918048783..aac2f4caee2d 100644 --- a/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js +++ b/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; diff --git a/packages/governance/test/swingsetTests/contractGovernor/vat-zoe.js b/packages/governance/test/swingsetTests/contractGovernor/vat-zoe.js index e3adb132a79f..075f74c1b40f 100644 --- a/packages/governance/test/swingsetTests/contractGovernor/vat-zoe.js +++ b/packages/governance/test/swingsetTests/contractGovernor/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '@agoric/zoe'; diff --git a/packages/governance/test/unitTests/test-ballotBuilder.js b/packages/governance/test/unitTests/test-ballotBuilder.js index dbce864eba8d..5e73df26d8a9 100644 --- a/packages/governance/test/unitTests/test-ballotBuilder.js +++ b/packages/governance/test/unitTests/test-ballotBuilder.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js'; import buildManualTimer from '@agoric/zoe/tools/manualTimer.js'; diff --git a/packages/governance/test/unitTests/test-ballotCount.js b/packages/governance/test/unitTests/test-ballotCount.js index 2278104198dc..018600d99158 100644 --- a/packages/governance/test/unitTests/test-ballotCount.js +++ b/packages/governance/test/unitTests/test-ballotCount.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import '@agoric/zoe/exported.js'; import { E } from '@endo/eventual-send'; diff --git a/packages/governance/test/unitTests/test-committee.js b/packages/governance/test/unitTests/test-committee.js index fb5b468a2eff..a92d7f8d1f4a 100644 --- a/packages/governance/test/unitTests/test-committee.js +++ b/packages/governance/test/unitTests/test-committee.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import '@agoric/zoe/exported.js'; diff --git a/packages/governance/test/unitTests/test-paramChangePositions.js b/packages/governance/test/unitTests/test-paramChangePositions.js index 5482ae5c465a..ebdba172c662 100644 --- a/packages/governance/test/unitTests/test-paramChangePositions.js +++ b/packages/governance/test/unitTests/test-paramChangePositions.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import '@agoric/zoe/exported.js'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/governance/test/unitTests/test-paramGovernance.js b/packages/governance/test/unitTests/test-paramGovernance.js index e378c6c16276..5752bf9f81ba 100644 --- a/packages/governance/test/unitTests/test-paramGovernance.js +++ b/packages/governance/test/unitTests/test-paramGovernance.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import '@agoric/zoe/exported.js'; diff --git a/packages/governance/test/unitTests/test-typedParamManager.js b/packages/governance/test/unitTests/test-typedParamManager.js index 2a279e276455..1bbe2a2d0549 100644 --- a/packages/governance/test/unitTests/test-typedParamManager.js +++ b/packages/governance/test/unitTests/test-typedParamManager.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeIssuerKit, AmountMath } from '@agoric/ertp'; import { makeStoredPublisherKit } from '@agoric/notifier'; From c07d5c39a5ece4a64359ea03ed84054631a6a42e Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 3 Nov 2022 14:29:14 -0700 Subject: [PATCH 7/8] chore: checkJs inter-protocol --- packages/inter-protocol/scripts/start-local-chain-boot.js | 2 -- packages/inter-protocol/src/collect.js | 2 -- packages/inter-protocol/src/econCommitteeCharter.js | 2 -- packages/inter-protocol/src/feeDistributor.js | 2 -- packages/inter-protocol/src/interest-math.js | 2 -- packages/inter-protocol/src/interest.js | 2 -- packages/inter-protocol/src/proposals/demoIssuers.js | 2 -- packages/inter-protocol/src/proposals/econ-behaviors.js | 2 -- packages/inter-protocol/src/proposals/startPSM.js | 2 -- packages/inter-protocol/src/psm/psmCharter.js | 2 -- packages/inter-protocol/src/reserve/assetReserve.js | 2 -- packages/inter-protocol/src/reserve/params.js | 2 -- .../src/vaultFactory/liquidateIncrementally.js | 2 -- .../inter-protocol/src/vaultFactory/liquidateMinimum.js | 2 -- packages/inter-protocol/src/vaultFactory/params.js | 2 -- packages/inter-protocol/src/vaultFactory/types.js | 2 -- packages/inter-protocol/src/vaultFactory/vaultDirector.js | 2 -- packages/inter-protocol/src/vaultFactory/vaultFactory.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/addPool.js | 2 -- .../src/vpool-xyk-amm/constantProduct/calcFees.js | 2 -- .../src/vpool-xyk-amm/constantProduct/calcSwapPrices.js | 2 -- .../src/vpool-xyk-amm/constantProduct/core.js | 2 -- .../src/vpool-xyk-amm/constantProduct/defaults.js | 2 -- .../src/vpool-xyk-amm/constantProduct/getXY.js | 2 -- .../src/vpool-xyk-amm/constantProduct/internal-types.js | 2 -- .../src/vpool-xyk-amm/constantProduct/invariants.js | 2 -- .../src/vpool-xyk-amm/constantProduct/swap.js | 2 -- .../src/vpool-xyk-amm/constantProduct/types.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/doublePool.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/estimate.js | 2 -- .../src/vpool-xyk-amm/multipoolMarketMaker.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/params.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/pool.js | 2 -- .../inter-protocol/src/vpool-xyk-amm/priceAuthority.js | 2 -- .../inter-protocol/src/vpool-xyk-amm/removeLiquidity.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/singlePool.js | 2 -- packages/inter-protocol/src/vpool-xyk-amm/types.js | 2 -- .../inter-protocol/test/amm/constantProduct/setupMints.js | 2 -- .../test/amm/constantProduct/test-calcDeltaX.js | 2 -- .../test/amm/constantProduct/test-calcDeltaY.js | 2 -- .../test/amm/constantProduct/test-estimator.js | 2 -- .../inter-protocol/test/amm/constantProduct/test-getXY.js | 2 -- .../test/amm/constantProduct/test-readmeScenario.js | 2 -- .../test/amm/vpool-xyk-amm/test-addLiquidity.js | 2 -- .../test/amm/vpool-xyk-amm/test-amm-governance.js | 2 -- .../test/amm/vpool-xyk-amm/test-liquidity.js | 2 -- .../test/amm/vpool-xyk-amm/test-xyk-amm-swap.js | 2 -- .../inter-protocol/test/attestation/exampleLoanUsage.js | 2 -- .../inter-protocol/test/attestation/test-attestation.js | 2 -- packages/inter-protocol/test/attestation/test-userFlow.js | 2 -- packages/inter-protocol/test/psm/setupPsm.js | 2 -- packages/inter-protocol/test/psm/test-psm.js | 2 -- packages/inter-protocol/test/reserve/test-reserve.js | 2 -- .../test/smartWallet/test-amm-integration.js | 2 -- packages/inter-protocol/test/supports.js | 2 -- .../test/swingsetTests/governance/bootstrap.js | 2 -- .../test/swingsetTests/governance/test-governance.js | 2 -- .../test/swingsetTests/governance/vat-alice.js | 2 -- .../test/swingsetTests/governance/vat-owner.js | 2 -- .../test/swingsetTests/governance/vat-voter.js | 2 -- .../test/swingsetTests/governance/vat-zoe.js | 2 -- packages/inter-protocol/test/swingsetTests/mockAmm.js | 2 -- packages/inter-protocol/test/swingsetTests/setup.js | 2 -- .../test/swingsetTests/vaultFactory/bootstrap.js | 2 -- .../test/swingsetTests/vaultFactory/test-vaultFactory.js | 2 -- .../test/swingsetTests/vaultFactory/vat-alice.js | 2 -- .../test/swingsetTests/vaultFactory/vat-owner.js | 2 -- .../test/swingsetTests/vaultFactory/vat-zoe.js | 2 -- packages/inter-protocol/test/test-feeDistributor.js | 2 -- packages/inter-protocol/test/test-voPool.js | 2 -- packages/inter-protocol/test/vaultFactory/driver.js | 2 -- packages/inter-protocol/test/vaultFactory/faucet.js | 2 -- .../inter-protocol/test/vaultFactory/test-liquidator.js | 2 -- .../test/vaultFactory/test-prioritizedVaults.js | 2 -- packages/inter-protocol/test/vaultFactory/test-storage.js | 2 -- .../test/vaultFactory/test-vault-interest.js | 2 -- packages/inter-protocol/test/vaultFactory/test-vault.js | 2 -- .../inter-protocol/test/vaultFactory/test-vaultFactory.js | 2 -- .../test/vaultFactory/vault-contract-wrapper.js | 2 -- packages/swingset-runner/jsconfig.json | 8 +------- 81 files changed, 1 insertion(+), 167 deletions(-) diff --git a/packages/inter-protocol/scripts/start-local-chain-boot.js b/packages/inter-protocol/scripts/start-local-chain-boot.js index e19f8065eb8b..c0ec4f01143e 100644 --- a/packages/inter-protocol/scripts/start-local-chain-boot.js +++ b/packages/inter-protocol/scripts/start-local-chain-boot.js @@ -1,5 +1,3 @@ -// @ts-check - /** @file Boot script for demoing oracles. Builds upon boot-psm to be used in integration tests. */ import { buildRootObject as buildPsmRootObject } from '@agoric/vats/src/core/boot-psm.js'; diff --git a/packages/inter-protocol/src/collect.js b/packages/inter-protocol/src/collect.js index 967d41430a1b..5408fb2242a1 100644 --- a/packages/inter-protocol/src/collect.js +++ b/packages/inter-protocol/src/collect.js @@ -1,5 +1,3 @@ -// @ts-check - const { fromEntries, keys, values } = Object; /** @type { (xs: X[], ys: Y[]) => [X, Y][]} */ diff --git a/packages/inter-protocol/src/econCommitteeCharter.js b/packages/inter-protocol/src/econCommitteeCharter.js index 8e9964b772d3..7d27a71b6f13 100644 --- a/packages/inter-protocol/src/econCommitteeCharter.js +++ b/packages/inter-protocol/src/econCommitteeCharter.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/governance/src/exported.js'; import '@agoric/zoe/exported.js'; import '@agoric/zoe/src/contracts/exported.js'; diff --git a/packages/inter-protocol/src/feeDistributor.js b/packages/inter-protocol/src/feeDistributor.js index 892b7d40f2b9..2b23b52c4604 100644 --- a/packages/inter-protocol/src/feeDistributor.js +++ b/packages/inter-protocol/src/feeDistributor.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { E, Far } from '@endo/far'; import { observeNotifier } from '@agoric/notifier'; diff --git a/packages/inter-protocol/src/interest-math.js b/packages/inter-protocol/src/interest-math.js index 8cc3f0e3e6da..b977cbe9b642 100644 --- a/packages/inter-protocol/src/interest-math.js +++ b/packages/inter-protocol/src/interest-math.js @@ -1,5 +1,3 @@ -// @ts-check - import { divideBy, multiplyBy, diff --git a/packages/inter-protocol/src/interest.js b/packages/inter-protocol/src/interest.js index b56eb6a1ea75..254c74551b7e 100644 --- a/packages/inter-protocol/src/interest.js +++ b/packages/inter-protocol/src/interest.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js'; import { diff --git a/packages/inter-protocol/src/proposals/demoIssuers.js b/packages/inter-protocol/src/proposals/demoIssuers.js index e8849f670890..20f85f8f89d8 100644 --- a/packages/inter-protocol/src/proposals/demoIssuers.js +++ b/packages/inter-protocol/src/proposals/demoIssuers.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath, AssetKind } from '@agoric/ertp'; import { objectMap } from '@agoric/internal'; import { diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js index 1558d78cca32..172a2889d23d 100644 --- a/packages/inter-protocol/src/proposals/econ-behaviors.js +++ b/packages/inter-protocol/src/proposals/econ-behaviors.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../exported.js'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/src/proposals/startPSM.js b/packages/inter-protocol/src/proposals/startPSM.js index a73cb2bcc4de..f4da273b8af7 100644 --- a/packages/inter-protocol/src/proposals/startPSM.js +++ b/packages/inter-protocol/src/proposals/startPSM.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath, AssetKind } from '@agoric/ertp'; import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance'; import { makeStorageNodeChild } from '@agoric/vats/src/lib-chainStorage.js'; diff --git a/packages/inter-protocol/src/psm/psmCharter.js b/packages/inter-protocol/src/psm/psmCharter.js index 5bbff37e0a6e..926aaa15ea22 100644 --- a/packages/inter-protocol/src/psm/psmCharter.js +++ b/packages/inter-protocol/src/psm/psmCharter.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/governance/src/exported.js'; import { makeScalarMapStore, M, makeHeapFarInstance, fit } from '@agoric/store'; import '@agoric/zoe/exported.js'; diff --git a/packages/inter-protocol/src/reserve/assetReserve.js b/packages/inter-protocol/src/reserve/assetReserve.js index eaa2bad38943..79d21eb78c63 100644 --- a/packages/inter-protocol/src/reserve/assetReserve.js +++ b/packages/inter-protocol/src/reserve/assetReserve.js @@ -1,5 +1,3 @@ -// @ts-check - import { E, Far } from '@endo/far'; import { AmountMath } from '@agoric/ertp'; import { handleParamGovernance, ParamTypes } from '@agoric/governance'; diff --git a/packages/inter-protocol/src/reserve/params.js b/packages/inter-protocol/src/reserve/params.js index cb1003144378..85d4c52c3a35 100644 --- a/packages/inter-protocol/src/reserve/params.js +++ b/packages/inter-protocol/src/reserve/params.js @@ -1,5 +1,3 @@ -// @ts-check - import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance'; export const AMM_INSTANCE = 'AmmInstance'; diff --git a/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js b/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js index bad67cdbebe9..64ed2ea14571 100644 --- a/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js +++ b/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js @@ -1,6 +1,4 @@ /* eslint-disable no-await-in-loop */ -// @ts-check - import { E } from '@endo/eventual-send'; import { getAmountOut, diff --git a/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js b/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js index 88c9772f0dfc..fa6af16697b4 100644 --- a/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js +++ b/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { ceilMultiplyBy, diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js index 270027b7cbbb..765b94354d0d 100644 --- a/packages/inter-protocol/src/vaultFactory/params.js +++ b/packages/inter-protocol/src/vaultFactory/params.js @@ -1,5 +1,3 @@ -// @ts-check - import './types.js'; import { diff --git a/packages/inter-protocol/src/vaultFactory/types.js b/packages/inter-protocol/src/vaultFactory/types.js index 8354bec93b9f..26473c00f6f6 100644 --- a/packages/inter-protocol/src/vaultFactory/types.js +++ b/packages/inter-protocol/src/vaultFactory/types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * @typedef {import('./vault').VaultNotification} VaultNotification * @typedef {import('./vault').Vault} Vault diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js index 9af46088e795..332283b92958 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js +++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import '@agoric/zoe/src/contracts/exported.js'; diff --git a/packages/inter-protocol/src/vaultFactory/vaultFactory.js b/packages/inter-protocol/src/vaultFactory/vaultFactory.js index 907ee95fd84f..ad00afb44000 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultFactory.js +++ b/packages/inter-protocol/src/vaultFactory/vaultFactory.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/governance/src/exported.js'; import '@agoric/zoe/exported.js'; import '@agoric/zoe/src/contracts/exported.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js b/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js index c102ff3b5a8a..737ad1943992 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js @@ -1,5 +1,3 @@ -// @ts-check - import { assertProposalShape, calcSecondaryRequired, diff --git a/packages/inter-protocol/src/vpool-xyk-amm/addPool.js b/packages/inter-protocol/src/vpool-xyk-amm/addPool.js index e08c7fc9e4d7..da442726a660 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/addPool.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/addPool.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { AmountMath, AssetKind } from '@agoric/ertp'; import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js index 4aa90f3507b5..86364763b9f1 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { ceilMultiplyBy, diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js index 46c8468858be..3deef9c0427a 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { swap } from './swap.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js index dcd73273a0c1..1755c01934de 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js index 4cddc39f4c19..90b8f0580a82 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js @@ -1,5 +1,3 @@ -// @ts-check - export const BASIS_POINTS = 10000n; export const DEFAULT_POOL_FEE = 24n; // 0.0024 or .24% export const DEFAULT_PROTOCOL_FEE = 6n; // .0006 or .06% diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js index 89de27bdf914..d805fedb40f0 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js @@ -1,5 +1,3 @@ -// @ts-check - // This does not support secondary to secondary. That has to happen at // a higher abstraction diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js index 519819d95ede..bcfae066e04c 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * @typedef {object} ImprovedNoFeeSwapResult * @property {Amount<'nat'>} amountIn diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js index 02b2d865dbfa..ce211dc0ecce 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js index 7619b500040d..858cf794d2ec 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { calculateFees, amountGT } from './calcFees.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js index 7fe86720da66..7fe34c37867a 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * @callback Maximum * @param {Amount} left diff --git a/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js b/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js index 1de800840bf9..9f4d4822ab5a 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { Far } from '@endo/marshal'; import { makeFeeRatio } from './constantProduct/calcFees.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/estimate.js b/packages/inter-protocol/src/vpool-xyk-amm/estimate.js index 222365d14be2..016d7dd7c2f1 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/estimate.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/estimate.js @@ -1,5 +1,3 @@ -// @ts-check - import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js'; import { AmountMath } from '@agoric/ertp'; import { BASIS_POINTS } from './constantProduct/defaults.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js b/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js index 9d436d92b94b..dcfcfb1bbd8c 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { AssetKind, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/params.js b/packages/inter-protocol/src/vpool-xyk-amm/params.js index 71682e4b3bcd..4f1acba003cf 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/params.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/params.js @@ -1,5 +1,3 @@ -// @ts-check - import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance'; export const POOL_FEE_KEY = 'PoolFee'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/pool.js b/packages/inter-protocol/src/vpool-xyk-amm/pool.js index 4e1ec873adf7..034b2b9850df 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/pool.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/pool.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { AmountMath, isNatValue } from '@agoric/ertp'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js b/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js index fee3628cf4ab..08af635edbc6 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { makeNotifierFromSubscriber, diff --git a/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js b/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js index c251ef490fd3..6cad9af89453 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js @@ -1,5 +1,3 @@ -// @ts-check - import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js'; import '@agoric/zoe/exported.js'; diff --git a/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js b/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js index 8ae030a9e1c1..d1049c502d44 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeFeeRatio } from './constantProduct/calcFees.js'; import { pricesForStatedInput, diff --git a/packages/inter-protocol/src/vpool-xyk-amm/types.js b/packages/inter-protocol/src/vpool-xyk-amm/types.js index 53bb0656064e..e8d363562e9a 100644 --- a/packages/inter-protocol/src/vpool-xyk-amm/types.js +++ b/packages/inter-protocol/src/vpool-xyk-amm/types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * @typedef {object} VPoolPriceQuote * @property {Amount<'nat'>} amountIn diff --git a/packages/inter-protocol/test/amm/constantProduct/setupMints.js b/packages/inter-protocol/test/amm/constantProduct/setupMints.js index 5b0d5ee52462..0b51cc9abc94 100644 --- a/packages/inter-protocol/test/amm/constantProduct/setupMints.js +++ b/packages/inter-protocol/test/amm/constantProduct/setupMints.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp'; export const setupMintKits = () => { diff --git a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js b/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js index fce192d02838..f7f7afa07557 100644 --- a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js +++ b/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js b/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js index c73e0db9a87f..e7caa703c139 100644 --- a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js +++ b/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/amm/constantProduct/test-estimator.js b/packages/inter-protocol/test/amm/constantProduct/test-estimator.js index 6b38fe61800a..6880163eb271 100644 --- a/packages/inter-protocol/test/amm/constantProduct/test-estimator.js +++ b/packages/inter-protocol/test/amm/constantProduct/test-estimator.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/amm/constantProduct/test-getXY.js b/packages/inter-protocol/test/amm/constantProduct/test-getXY.js index 1a15b8fd9ede..6a200c2f4138 100644 --- a/packages/inter-protocol/test/amm/constantProduct/test-getXY.js +++ b/packages/inter-protocol/test/amm/constantProduct/test-getXY.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js b/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js index d72204a586b2..22b1f5abfb62 100644 --- a/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js +++ b/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js index 1b41409b5156..c76e06368233 100644 --- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js +++ b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js index c73798aee651..1c78ad2fde95 100644 --- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js +++ b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; 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 index 7c84ee9cc731..271deb57d68b 100644 --- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js +++ b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js @@ -1,5 +1,3 @@ -// @ts-check - import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js index 111552445621..0e7962e96605 100644 --- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js +++ b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/attestation/exampleLoanUsage.js b/packages/inter-protocol/test/attestation/exampleLoanUsage.js index fb7ea1b2aa90..4fba805e6f91 100644 --- a/packages/inter-protocol/test/attestation/exampleLoanUsage.js +++ b/packages/inter-protocol/test/attestation/exampleLoanUsage.js @@ -1,5 +1,3 @@ -// @ts-check - /** * ** Create loan: * diff --git a/packages/inter-protocol/test/attestation/test-attestation.js b/packages/inter-protocol/test/attestation/test-attestation.js index b808046986d6..d8d7f7a47c36 100644 --- a/packages/inter-protocol/test/attestation/test-attestation.js +++ b/packages/inter-protocol/test/attestation/test-attestation.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/attestation/test-userFlow.js b/packages/inter-protocol/test/attestation/test-userFlow.js index e2e7c7a6d14f..564f8664055a 100644 --- a/packages/inter-protocol/test/attestation/test-userFlow.js +++ b/packages/inter-protocol/test/attestation/test-userFlow.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/psm/setupPsm.js b/packages/inter-protocol/test/psm/setupPsm.js index 6d5ef1e2e43b..9389e2aa8c40 100644 --- a/packages/inter-protocol/test/psm/setupPsm.js +++ b/packages/inter-protocol/test/psm/setupPsm.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far, makeLoopback } from '@endo/captp'; import { E } from '@endo/eventual-send'; diff --git a/packages/inter-protocol/test/psm/test-psm.js b/packages/inter-protocol/test/psm/test-psm.js index b8c3e40731b7..f866c0d6ef03 100644 --- a/packages/inter-protocol/test/psm/test-psm.js +++ b/packages/inter-protocol/test/psm/test-psm.js @@ -1,5 +1,3 @@ -// @ts-check - import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import '@agoric/zoe/exported.js'; diff --git a/packages/inter-protocol/test/reserve/test-reserve.js b/packages/inter-protocol/test/reserve/test-reserve.js index e4d25aab90b0..d65dd921ac6d 100644 --- a/packages/inter-protocol/test/reserve/test-reserve.js +++ b/packages/inter-protocol/test/reserve/test-reserve.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/smartWallet/test-amm-integration.js b/packages/inter-protocol/test/smartWallet/test-amm-integration.js index 5bcc24cda6db..ef25b243a5f9 100644 --- a/packages/inter-protocol/test/smartWallet/test-amm-integration.js +++ b/packages/inter-protocol/test/smartWallet/test-amm-integration.js @@ -1,5 +1,3 @@ -// @ts-check - import test from 'ava'; // defer to after ps0 diff --git a/packages/inter-protocol/test/supports.js b/packages/inter-protocol/test/supports.js index 4526ad08c872..1af834592bfd 100644 --- a/packages/inter-protocol/test/supports.js +++ b/packages/inter-protocol/test/supports.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import binaryVoteCounterBundle from '@agoric/governance/bundles/bundle-binaryVoteCounter.js'; import committeeBundle from '@agoric/governance/bundles/bundle-committee.js'; diff --git a/packages/inter-protocol/test/swingsetTests/governance/bootstrap.js b/packages/inter-protocol/test/swingsetTests/governance/bootstrap.js index af4f0ba5b40f..bb193b21e9bc 100644 --- a/packages/inter-protocol/test/swingsetTests/governance/bootstrap.js +++ b/packages/inter-protocol/test/swingsetTests/governance/bootstrap.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/inter-protocol/test/swingsetTests/governance/test-governance.js b/packages/inter-protocol/test/swingsetTests/governance/test-governance.js index 806947ce5e00..85b9e4549c7b 100644 --- a/packages/inter-protocol/test/swingsetTests/governance/test-governance.js +++ b/packages/inter-protocol/test/swingsetTests/governance/test-governance.js @@ -1,5 +1,3 @@ -// @ts-check - import '@endo/init/debug.js'; import binaryVoteCounterBundle from '@agoric/governance/bundles/bundle-binaryVoteCounter.js'; diff --git a/packages/inter-protocol/test/swingsetTests/governance/vat-alice.js b/packages/inter-protocol/test/swingsetTests/governance/vat-alice.js index a60933ea313e..4983397dc578 100644 --- a/packages/inter-protocol/test/swingsetTests/governance/vat-alice.js +++ b/packages/inter-protocol/test/swingsetTests/governance/vat-alice.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/swingsetTests/governance/vat-owner.js b/packages/inter-protocol/test/swingsetTests/governance/vat-owner.js index 37a7e6b48410..8ca58c73400b 100644 --- a/packages/inter-protocol/test/swingsetTests/governance/vat-owner.js +++ b/packages/inter-protocol/test/swingsetTests/governance/vat-owner.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { buildOwner } from '../setup.js'; diff --git a/packages/inter-protocol/test/swingsetTests/governance/vat-voter.js b/packages/inter-protocol/test/swingsetTests/governance/vat-voter.js index e72d986b9146..13cc6fe36317 100644 --- a/packages/inter-protocol/test/swingsetTests/governance/vat-voter.js +++ b/packages/inter-protocol/test/swingsetTests/governance/vat-voter.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { diff --git a/packages/inter-protocol/test/swingsetTests/governance/vat-zoe.js b/packages/inter-protocol/test/swingsetTests/governance/vat-zoe.js index e3e358df0d5e..71f23d456682 100644 --- a/packages/inter-protocol/test/swingsetTests/governance/vat-zoe.js +++ b/packages/inter-protocol/test/swingsetTests/governance/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '@agoric/zoe'; diff --git a/packages/inter-protocol/test/swingsetTests/mockAmm.js b/packages/inter-protocol/test/swingsetTests/mockAmm.js index 3468cc5a884e..b229916377ab 100644 --- a/packages/inter-protocol/test/swingsetTests/mockAmm.js +++ b/packages/inter-protocol/test/swingsetTests/mockAmm.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; /** @type {any} */ diff --git a/packages/inter-protocol/test/swingsetTests/setup.js b/packages/inter-protocol/test/swingsetTests/setup.js index 5074b794c901..3f26c9596518 100644 --- a/packages/inter-protocol/test/swingsetTests/setup.js +++ b/packages/inter-protocol/test/swingsetTests/setup.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { makeIssuerKit, AmountMath } from '@agoric/ertp'; import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/bootstrap.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/bootstrap.js index bc0e5238a2f9..cf83fe0b6b05 100644 --- a/packages/inter-protocol/test/swingsetTests/vaultFactory/bootstrap.js +++ b/packages/inter-protocol/test/swingsetTests/vaultFactory/bootstrap.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { installContracts, makeVats } from '../setup'; diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js index 449011a7bef8..9340a718577a 100644 --- a/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js +++ b/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js @@ -1,5 +1,3 @@ -// @ts-check - import '@endo/init/debug.js'; import anyTest from 'ava'; import path from 'path'; diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-alice.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-alice.js index 025dde11a657..9d3d5301e475 100644 --- a/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-alice.js +++ b/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-alice.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X, q } from '@agoric/assert'; diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-owner.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-owner.js index 37a7e6b48410..8ca58c73400b 100644 --- a/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-owner.js +++ b/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-owner.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { buildOwner } from '../setup.js'; diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-zoe.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-zoe.js index e34efc43f8a3..a10cbbe39375 100644 --- a/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-zoe.js +++ b/packages/inter-protocol/test/swingsetTests/vaultFactory/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '@agoric/zoe'; diff --git a/packages/inter-protocol/test/test-feeDistributor.js b/packages/inter-protocol/test/test-feeDistributor.js index 38610c33b260..11740e4d296c 100644 --- a/packages/inter-protocol/test/test-feeDistributor.js +++ b/packages/inter-protocol/test/test-feeDistributor.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/test-voPool.js b/packages/inter-protocol/test/test-voPool.js index 38b68382afd5..16cd90662a2a 100644 --- a/packages/inter-protocol/test/test-voPool.js +++ b/packages/inter-protocol/test/test-voPool.js @@ -1,5 +1,3 @@ -// @ts-check - import { runVOTest, test } from '@agoric/swingset-vat/tools/vo-test-harness.js'; import { AmountMath, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/driver.js b/packages/inter-protocol/test/vaultFactory/driver.js index c0e7b288e050..725430278277 100644 --- a/packages/inter-protocol/test/vaultFactory/driver.js +++ b/packages/inter-protocol/test/vaultFactory/driver.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/inter-protocol/test/vaultFactory/faucet.js b/packages/inter-protocol/test/vaultFactory/faucet.js index 7b761c8d9c16..d3033d0a5c5b 100644 --- a/packages/inter-protocol/test/vaultFactory/faucet.js +++ b/packages/inter-protocol/test/vaultFactory/faucet.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js'; diff --git a/packages/inter-protocol/test/vaultFactory/test-liquidator.js b/packages/inter-protocol/test/vaultFactory/test-liquidator.js index 70e10a3c0165..7e51e3cc8f17 100644 --- a/packages/inter-protocol/test/vaultFactory/test-liquidator.js +++ b/packages/inter-protocol/test/vaultFactory/test-liquidator.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/vaultFactory/test-prioritizedVaults.js b/packages/inter-protocol/test/vaultFactory/test-prioritizedVaults.js index 97edb3e7fe24..be51d6776bec 100644 --- a/packages/inter-protocol/test/vaultFactory/test-prioritizedVaults.js +++ b/packages/inter-protocol/test/vaultFactory/test-prioritizedVaults.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/vaultFactory/test-storage.js b/packages/inter-protocol/test/vaultFactory/test-storage.js index c4ac7e6289c7..c2c9f27578cc 100644 --- a/packages/inter-protocol/test/vaultFactory/test-storage.js +++ b/packages/inter-protocol/test/vaultFactory/test-storage.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/vaultFactory/test-vault-interest.js b/packages/inter-protocol/test/vaultFactory/test-vault-interest.js index 4ffaabc5c1a0..3994277e306e 100644 --- a/packages/inter-protocol/test/vaultFactory/test-vault-interest.js +++ b/packages/inter-protocol/test/vaultFactory/test-vault-interest.js @@ -1,5 +1,3 @@ -// @ts-check - import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import '@agoric/zoe/exported.js'; diff --git a/packages/inter-protocol/test/vaultFactory/test-vault.js b/packages/inter-protocol/test/vaultFactory/test-vault.js index 2ed28dbc134e..8c10f1c07f76 100644 --- a/packages/inter-protocol/test/vaultFactory/test-vault.js +++ b/packages/inter-protocol/test/vaultFactory/test-vault.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js index 020dc240158e..d6b9fe58785a 100644 --- a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js +++ b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/exported.js'; import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; diff --git a/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js b/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js index 142bff39a5a4..a82ce3535b83 100644 --- a/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js +++ b/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js @@ -1,5 +1,3 @@ -// @ts-check - import '@agoric/zoe/src/types.js'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/swingset-runner/jsconfig.json b/packages/swingset-runner/jsconfig.json index 45e30474b337..3c39b292fd66 100644 --- a/packages/swingset-runner/jsconfig.json +++ b/packages/swingset-runner/jsconfig.json @@ -3,14 +3,8 @@ "compilerOptions": { "target": "esnext", "module": "esnext", - + "checkJs": true, "noEmit": true, -/* - // The following flags are for creating .d.ts files: - "noEmit": false, - "declaration": true, - "emitDeclarationOnly": true, -*/ "downlevelIteration": true, "strictNullChecks": true, "moduleResolution": "node", From 3019c4be1afbd81b3680cebf1e2142965bb9e872 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 3 Nov 2022 14:38:42 -0700 Subject: [PATCH 8/8] chore: checkJs zoe --- packages/zoe/jsconfig.json | 1 + packages/zoe/package.json | 1 + packages/zoe/src/cleanProposal.js | 2 -- packages/zoe/src/contractFacet/evalContractCode.js | 2 -- packages/zoe/src/contractFacet/exit.js | 2 -- packages/zoe/src/contractFacet/internal-types.js | 2 -- packages/zoe/src/contractFacet/offerHandlerStorage.js | 2 -- packages/zoe/src/contractFacet/offerSafety.js | 2 -- packages/zoe/src/contractFacet/rightsConservation.js | 2 -- packages/zoe/src/contractFacet/vatRoot.js | 2 -- packages/zoe/src/contractFacet/zcfMint.js | 2 -- packages/zoe/src/contractFacet/zcfSeat.js | 2 -- packages/zoe/src/contractFacet/zcfZygote.js | 2 -- packages/zoe/src/contractSupport/bondingCurves.js | 2 -- packages/zoe/src/contractSupport/index.js | 2 -- packages/zoe/src/contractSupport/priceAuthorityTransform.js | 2 -- packages/zoe/src/contractSupport/priceQuote.js | 2 -- packages/zoe/src/contractSupport/ratio.js | 2 -- packages/zoe/src/contractSupport/safeMath.js | 2 -- packages/zoe/src/contractSupport/stateMachine.js | 2 -- packages/zoe/src/contracts/atomicSwap.js | 2 -- packages/zoe/src/contracts/auction/assertBidSeat.js | 2 -- packages/zoe/src/contracts/auction/firstPriceLogic.js | 2 -- packages/zoe/src/contracts/auction/index.js | 2 -- packages/zoe/src/contracts/auction/secondPriceLogic.js | 2 -- packages/zoe/src/contracts/automaticRefund.js | 2 -- packages/zoe/src/contracts/autoswap.js | 2 -- packages/zoe/src/contracts/barterExchange.js | 2 -- packages/zoe/src/contracts/callSpread/calculateShares.js | 2 -- packages/zoe/src/contracts/callSpread/fundedCallSpread.js | 2 -- packages/zoe/src/contracts/callSpread/payoffHandler.js | 2 -- packages/zoe/src/contracts/callSpread/percent.js | 2 -- packages/zoe/src/contracts/callSpread/position.js | 2 -- packages/zoe/src/contracts/callSpread/pricedCallSpread.js | 2 -- packages/zoe/src/contracts/coveredCall-durable.js | 2 -- packages/zoe/src/contracts/coveredCall.js | 2 -- packages/zoe/src/contracts/loan/addCollateral.js | 2 -- packages/zoe/src/contracts/loan/borrow.js | 2 -- packages/zoe/src/contracts/loan/close.js | 2 -- packages/zoe/src/contracts/loan/index.js | 2 -- packages/zoe/src/contracts/loan/lend.js | 2 -- packages/zoe/src/contracts/loan/liquidate.js | 2 -- packages/zoe/src/contracts/loan/scheduleLiquidation.js | 2 -- packages/zoe/src/contracts/loan/updateDebt.js | 2 -- packages/zoe/src/contracts/mintAndSellNFT.js | 2 -- packages/zoe/src/contracts/mintPayments.js | 2 -- packages/zoe/src/contracts/oracle.js | 2 -- packages/zoe/src/contracts/otcDesk.js | 2 -- packages/zoe/src/contracts/scaledPriceAuthority.js | 2 -- packages/zoe/src/contracts/sellItems.js | 2 -- packages/zoe/src/contracts/simpleExchange.js | 2 -- packages/zoe/src/handleWarning.js | 2 -- packages/zoe/src/instanceRecordStorage.js | 2 -- packages/zoe/src/issuerStorage.js | 2 -- packages/zoe/src/makeHandle.js | 2 -- packages/zoe/src/objArrayConversion.js | 2 -- packages/zoe/src/typeGuards.js | 2 -- packages/zoe/src/zoeService/escrowStorage.js | 2 -- packages/zoe/src/zoeService/feeMint.js | 2 -- packages/zoe/src/zoeService/installationStorage.js | 2 -- packages/zoe/src/zoeService/instanceAdminStorage.js | 2 -- packages/zoe/src/zoeService/internal-types.js | 2 -- packages/zoe/src/zoeService/invitationQueries.js | 2 -- packages/zoe/src/zoeService/offer/burnInvitation.js | 2 -- packages/zoe/src/zoeService/startInstance.js | 2 -- packages/zoe/src/zoeService/zoe.js | 4 ++-- packages/zoe/src/zoeService/zoeSeat.js | 2 -- packages/zoe/src/zoeService/zoeStorageManager.js | 2 -- packages/zoe/test/autoswapJig.js | 2 -- packages/zoe/test/offerArgsUsageContract.js | 2 -- packages/zoe/test/privateArgsUsageContract.js | 2 -- packages/zoe/test/runMintContract.js | 2 -- packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js | 2 -- .../test/swingsetTests/brokenContracts/crashingAutoRefund.js | 2 -- packages/zoe/test/swingsetTests/brokenContracts/vat-zoe.js | 2 -- packages/zoe/test/swingsetTests/helpers.js | 2 -- packages/zoe/test/swingsetTests/makeKind/vat-zoe.js | 2 -- packages/zoe/test/swingsetTests/offerArgs/vat-zoe.js | 2 -- packages/zoe/test/swingsetTests/privateArgs/vat-zoe.js | 2 -- packages/zoe/test/swingsetTests/runMint/vat-zoe.js | 2 -- .../upgradeCoveredCall/coveredCall-durable-V3.js | 2 -- .../test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js | 2 -- packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-zoe.js | 2 -- packages/zoe/test/swingsetTests/zoe/bootstrap.js | 2 -- packages/zoe/test/swingsetTests/zoe/vat-alice.js | 2 -- packages/zoe/test/swingsetTests/zoe/vat-bob.js | 2 -- packages/zoe/test/swingsetTests/zoe/vat-carol.js | 2 -- packages/zoe/test/swingsetTests/zoe/vat-dave.js | 2 -- packages/zoe/test/swingsetTests/zoe/vat-zoe.js | 2 -- packages/zoe/test/unitTests/bounty.js | 2 -- packages/zoe/test/unitTests/contracts/brokenAutoRefund.js | 2 -- packages/zoe/test/unitTests/contracts/useObjExample.js | 2 -- packages/zoe/test/unitTests/installFromSource.js | 2 -- packages/zoe/test/unitTests/makeOffer.js | 2 -- packages/zoe/test/unitTests/setupBasicMints.js | 2 -- packages/zoe/test/unitTests/setupMixedMints.js | 2 -- packages/zoe/test/unitTests/setupNonFungibleMints.js | 2 -- packages/zoe/test/unitTests/test-cleanProposal.js | 2 -- packages/zoe/test/unitTests/test-issuerStorage.js | 2 -- packages/zoe/test/unitTests/test-offerSafety.js | 2 -- packages/zoe/test/unitTests/test-rightsConservation.js | 2 -- packages/zoe/test/unitTests/zcf/registerFeeMintContract.js | 2 -- packages/zoe/test/unitTests/zcf/setupZcfTest.js | 2 -- packages/zoe/test/unitTests/zcf/test-offerHandlerStorage.js | 2 -- packages/zoe/test/unitTests/zcf/zcfTesterContract.js | 2 -- packages/zoe/test/unitTests/zoe/test-createZCFVat.js | 2 -- packages/zoe/test/unitTests/zoe/test-escrowStorage.js | 2 -- packages/zoe/test/unitTests/zoe/test-instanceAdminStorage.js | 2 -- packages/zoe/test/unitTests/zoe/test-makeInvitation.js | 2 -- packages/zoe/test/zoeTestHelpers.js | 2 -- packages/zoe/tools/fakeVatAdmin.js | 2 -- packages/zoe/tools/manualPriceAuthority.js | 2 -- packages/zoe/tools/prepare-test-env-ava.js | 2 -- packages/zoe/tools/prepare-test-env.js | 2 -- packages/zoe/tools/priceAuthorityRegistry.js | 2 -- packages/zoe/tools/scriptedPriceAuthority.js | 2 -- 116 files changed, 4 insertions(+), 228 deletions(-) diff --git a/packages/zoe/jsconfig.json b/packages/zoe/jsconfig.json index c82e40c71e1f..dcfda01d3548 100644 --- a/packages/zoe/jsconfig.json +++ b/packages/zoe/jsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "target": "esnext", "module": "esnext", + "checkJs": true, "noEmit": true, "downlevelIteration": true, "strictNullChecks": true, diff --git a/packages/zoe/package.json b/packages/zoe/package.json index 0d710ebe93e7..7be091782445 100644 --- a/packages/zoe/package.json +++ b/packages/zoe/package.json @@ -51,6 +51,7 @@ "@agoric/store": "^0.8.3", "@agoric/swingset-vat": "^0.30.2", "@agoric/vat-data": "^0.4.3", + "@agoric/vats": "^0.13.0", "@endo/bundle-source": "^2.4.1", "@endo/eventual-send": "^0.16.7", "@endo/far": "^0.2.13", diff --git a/packages/zoe/src/cleanProposal.js b/packages/zoe/src/cleanProposal.js index 2d63341a0799..6a8ca885305e 100644 --- a/packages/zoe/src/cleanProposal.js +++ b/packages/zoe/src/cleanProposal.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X, q } from '@agoric/assert'; import { AmountMath, getAssetKind } from '@agoric/ertp'; import { assertRecord } from '@endo/marshal'; diff --git a/packages/zoe/src/contractFacet/evalContractCode.js b/packages/zoe/src/contractFacet/evalContractCode.js index e46d4fbdb7af..3c5d88261274 100644 --- a/packages/zoe/src/contractFacet/evalContractCode.js +++ b/packages/zoe/src/contractFacet/evalContractCode.js @@ -1,5 +1,3 @@ -// @ts-check - // NB: cannot import, breaks bundle building /* global globalThis */ diff --git a/packages/zoe/src/contractFacet/exit.js b/packages/zoe/src/contractFacet/exit.js index cea155e389fc..0e08d2467df7 100644 --- a/packages/zoe/src/contractFacet/exit.js +++ b/packages/zoe/src/contractFacet/exit.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X, q } from '@agoric/assert'; import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/src/contractFacet/internal-types.js b/packages/zoe/src/contractFacet/internal-types.js index e64fc6a2c05f..214cfa65a749 100644 --- a/packages/zoe/src/contractFacet/internal-types.js +++ b/packages/zoe/src/contractFacet/internal-types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * @typedef {( {zcf: ZCF} ) => void} TestJigSetter */ diff --git a/packages/zoe/src/contractFacet/offerHandlerStorage.js b/packages/zoe/src/contractFacet/offerHandlerStorage.js index 5f34a0a73366..6f80247f4a78 100644 --- a/packages/zoe/src/contractFacet/offerHandlerStorage.js +++ b/packages/zoe/src/contractFacet/offerHandlerStorage.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeWeakStore } from '@agoric/store'; import { ToFarFunction } from '@endo/marshal'; import { canBeDurable, provideDurableWeakMapStore } from '@agoric/vat-data'; diff --git a/packages/zoe/src/contractFacet/offerSafety.js b/packages/zoe/src/contractFacet/offerSafety.js index e915e54300d8..6171b00287d7 100644 --- a/packages/zoe/src/contractFacet/offerSafety.js +++ b/packages/zoe/src/contractFacet/offerSafety.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; /** diff --git a/packages/zoe/src/contractFacet/rightsConservation.js b/packages/zoe/src/contractFacet/rightsConservation.js index 067773a094d8..e8a1fd9a0a91 100644 --- a/packages/zoe/src/contractFacet/rightsConservation.js +++ b/packages/zoe/src/contractFacet/rightsConservation.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeStore } from '@agoric/store'; import { assert, details as X } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/src/contractFacet/vatRoot.js b/packages/zoe/src/contractFacet/vatRoot.js index 03468e354de3..db5ff490102c 100644 --- a/packages/zoe/src/contractFacet/vatRoot.js +++ b/packages/zoe/src/contractFacet/vatRoot.js @@ -1,5 +1,3 @@ -// @ts-check - // 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/contractFacet/zcfMint.js b/packages/zoe/src/contractFacet/zcfMint.js index e8c42cbe4c15..249e275e9b1e 100644 --- a/packages/zoe/src/contractFacet/zcfMint.js +++ b/packages/zoe/src/contractFacet/zcfMint.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { AmountMath } from '@agoric/ertp'; import { diff --git a/packages/zoe/src/contractFacet/zcfSeat.js b/packages/zoe/src/contractFacet/zcfSeat.js index 6dca5b5d28ea..c0e682e17613 100644 --- a/packages/zoe/src/contractFacet/zcfSeat.js +++ b/packages/zoe/src/contractFacet/zcfSeat.js @@ -1,5 +1,3 @@ -// @ts-check - import { provideDurableWeakMapStore, provideDurableMapStore, diff --git a/packages/zoe/src/contractFacet/zcfZygote.js b/packages/zoe/src/contractFacet/zcfZygote.js index c50275a290ab..2ae985791958 100644 --- a/packages/zoe/src/contractFacet/zcfZygote.js +++ b/packages/zoe/src/contractFacet/zcfZygote.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far, Remotable, passStyleOf } from '@endo/marshal'; import { AssetKind } from '@agoric/ertp'; diff --git a/packages/zoe/src/contractSupport/bondingCurves.js b/packages/zoe/src/contractSupport/bondingCurves.js index 958629da982a..f8f46a81eb6e 100644 --- a/packages/zoe/src/contractSupport/bondingCurves.js +++ b/packages/zoe/src/contractSupport/bondingCurves.js @@ -1,5 +1,3 @@ -// @ts-check - import { Nat } from '@agoric/nat'; import { natSafeMath } from './safeMath.js'; diff --git a/packages/zoe/src/contractSupport/index.js b/packages/zoe/src/contractSupport/index.js index b66da6378cd7..5d2504742530 100644 --- a/packages/zoe/src/contractSupport/index.js +++ b/packages/zoe/src/contractSupport/index.js @@ -1,5 +1,3 @@ -// @ts-check - export { getInputPrice, getOutputPrice, diff --git a/packages/zoe/src/contractSupport/priceAuthorityTransform.js b/packages/zoe/src/contractSupport/priceAuthorityTransform.js index a087750d92bf..f39a3c035ad6 100644 --- a/packages/zoe/src/contractSupport/priceAuthorityTransform.js +++ b/packages/zoe/src/contractSupport/priceAuthorityTransform.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/src/contractSupport/priceQuote.js b/packages/zoe/src/contractSupport/priceQuote.js index 0d492b6e64a0..87ccd6715993 100644 --- a/packages/zoe/src/contractSupport/priceQuote.js +++ b/packages/zoe/src/contractSupport/priceQuote.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { Nat } from '@agoric/nat'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/contractSupport/ratio.js b/packages/zoe/src/contractSupport/ratio.js index 6a0e8d70c6d5..644e7c4df860 100644 --- a/packages/zoe/src/contractSupport/ratio.js +++ b/packages/zoe/src/contractSupport/ratio.js @@ -1,5 +1,3 @@ -// @ts-check - import './types.js'; import { assert, details as X, q } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/src/contractSupport/safeMath.js b/packages/zoe/src/contractSupport/safeMath.js index aa07de95a5cb..0fc4df92b55e 100644 --- a/packages/zoe/src/contractSupport/safeMath.js +++ b/packages/zoe/src/contractSupport/safeMath.js @@ -1,5 +1,3 @@ -// @ts-check - import { Nat } from '@agoric/nat'; /** diff --git a/packages/zoe/src/contractSupport/stateMachine.js b/packages/zoe/src/contractSupport/stateMachine.js index 968f800cc103..2f505a370ef5 100644 --- a/packages/zoe/src/contractSupport/stateMachine.js +++ b/packages/zoe/src/contractSupport/stateMachine.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert } from '@agoric/assert'; /* allowedTransitions is an array of arrays which gets turned into a diff --git a/packages/zoe/src/contracts/atomicSwap.js b/packages/zoe/src/contracts/atomicSwap.js index 23cb5768fa01..81f5030bbed6 100644 --- a/packages/zoe/src/contracts/atomicSwap.js +++ b/packages/zoe/src/contracts/atomicSwap.js @@ -1,5 +1,3 @@ -// @ts-check - // Eventually will be importable from '@agoric/zoe-contract-support' import { assertIssuerKeywords, diff --git a/packages/zoe/src/contracts/auction/assertBidSeat.js b/packages/zoe/src/contracts/auction/assertBidSeat.js index bab8def1ccbb..c2e79f676e1b 100644 --- a/packages/zoe/src/contracts/auction/assertBidSeat.js +++ b/packages/zoe/src/contracts/auction/assertBidSeat.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/src/contracts/auction/firstPriceLogic.js b/packages/zoe/src/contracts/auction/firstPriceLogic.js index 450acafaffd6..a50be03a3945 100644 --- a/packages/zoe/src/contracts/auction/firstPriceLogic.js +++ b/packages/zoe/src/contracts/auction/firstPriceLogic.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; /** diff --git a/packages/zoe/src/contracts/auction/index.js b/packages/zoe/src/contracts/auction/index.js index 78b8401160da..eff329e567b2 100644 --- a/packages/zoe/src/contracts/auction/index.js +++ b/packages/zoe/src/contracts/auction/index.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { TimeMath } from '@agoric/swingset-vat/src/vats/timer/timeMath.js'; diff --git a/packages/zoe/src/contracts/auction/secondPriceLogic.js b/packages/zoe/src/contracts/auction/secondPriceLogic.js index 712f0c3794b3..006b4f89f456 100644 --- a/packages/zoe/src/contracts/auction/secondPriceLogic.js +++ b/packages/zoe/src/contracts/auction/secondPriceLogic.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; /** diff --git a/packages/zoe/src/contracts/automaticRefund.js b/packages/zoe/src/contracts/automaticRefund.js index e825933b3c26..0691590b6e9a 100644 --- a/packages/zoe/src/contracts/automaticRefund.js +++ b/packages/zoe/src/contracts/automaticRefund.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import '../../exported.js'; diff --git a/packages/zoe/src/contracts/autoswap.js b/packages/zoe/src/contracts/autoswap.js index 02cc3ce8d5e2..6ed4899dc7d5 100644 --- a/packages/zoe/src/contracts/autoswap.js +++ b/packages/zoe/src/contracts/autoswap.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { assert } from '@agoric/assert'; import { AmountMath, isNatValue } from '@agoric/ertp'; diff --git a/packages/zoe/src/contracts/barterExchange.js b/packages/zoe/src/contracts/barterExchange.js index 770a7407569f..aed416722d26 100644 --- a/packages/zoe/src/contracts/barterExchange.js +++ b/packages/zoe/src/contracts/barterExchange.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeLegacyMap } from '@agoric/store'; import '../../exported.js'; diff --git a/packages/zoe/src/contracts/callSpread/calculateShares.js b/packages/zoe/src/contracts/callSpread/calculateShares.js index 328b689ef529..5528237117e5 100644 --- a/packages/zoe/src/contracts/callSpread/calculateShares.js +++ b/packages/zoe/src/contracts/callSpread/calculateShares.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import './types.js'; diff --git a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js index e7a7f3cc110b..8da9dd6bcfdc 100644 --- a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js +++ b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import './types.js'; diff --git a/packages/zoe/src/contracts/callSpread/payoffHandler.js b/packages/zoe/src/contracts/callSpread/payoffHandler.js index 9fb999e65774..252fed4108dd 100644 --- a/packages/zoe/src/contracts/callSpread/payoffHandler.js +++ b/packages/zoe/src/contracts/callSpread/payoffHandler.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import './types.js'; diff --git a/packages/zoe/src/contracts/callSpread/percent.js b/packages/zoe/src/contracts/callSpread/percent.js index f725fabb44e0..b408dd389e9f 100644 --- a/packages/zoe/src/contracts/callSpread/percent.js +++ b/packages/zoe/src/contracts/callSpread/percent.js @@ -1,5 +1,3 @@ -// @ts-check - // some tools to make treating ratios as percents easier import { makeRatio } from '../../contractSupport/index.js'; diff --git a/packages/zoe/src/contracts/callSpread/position.js b/packages/zoe/src/contracts/callSpread/position.js index 59b38cbf9db8..94f5c5f24e15 100644 --- a/packages/zoe/src/contracts/callSpread/position.js +++ b/packages/zoe/src/contracts/callSpread/position.js @@ -1,5 +1,3 @@ -// @ts-check - /** * Constants for long and short positions. * diff --git a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js index 538d08a3e268..e7f1547e6e17 100644 --- a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js +++ b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import './types.js'; diff --git a/packages/zoe/src/contracts/coveredCall-durable.js b/packages/zoe/src/contracts/coveredCall-durable.js index ac38535fccb1..1b66b2fbddd5 100644 --- a/packages/zoe/src/contracts/coveredCall-durable.js +++ b/packages/zoe/src/contracts/coveredCall-durable.js @@ -1,5 +1,3 @@ -// @ts-check - import { fit, M } from '@agoric/store'; import '../../exported.js'; diff --git a/packages/zoe/src/contracts/coveredCall.js b/packages/zoe/src/contracts/coveredCall.js index 968a67b65bfe..5f6772ada3ed 100644 --- a/packages/zoe/src/contracts/coveredCall.js +++ b/packages/zoe/src/contracts/coveredCall.js @@ -1,5 +1,3 @@ -// @ts-check - import { M, fit } from '@agoric/store'; import '../../exported.js'; diff --git a/packages/zoe/src/contracts/loan/addCollateral.js b/packages/zoe/src/contracts/loan/addCollateral.js index e112fc7bb951..7517b616601c 100644 --- a/packages/zoe/src/contracts/loan/addCollateral.js +++ b/packages/zoe/src/contracts/loan/addCollateral.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { assertProposalShape } from '../../contractSupport/index.js'; diff --git a/packages/zoe/src/contracts/loan/borrow.js b/packages/zoe/src/contracts/loan/borrow.js index 76ea14bc9028..0b19a7c9748c 100644 --- a/packages/zoe/src/contracts/loan/borrow.js +++ b/packages/zoe/src/contracts/loan/borrow.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/src/contracts/loan/close.js b/packages/zoe/src/contracts/loan/close.js index 8702116786a2..4e8c7b9db1ab 100644 --- a/packages/zoe/src/contracts/loan/close.js +++ b/packages/zoe/src/contracts/loan/close.js @@ -1,5 +1,3 @@ -// @ts-check - import './types.js'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/src/contracts/loan/index.js b/packages/zoe/src/contracts/loan/index.js index f7c6ab3efa0f..4b071fe742df 100644 --- a/packages/zoe/src/contracts/loan/index.js +++ b/packages/zoe/src/contracts/loan/index.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { Nat } from '@agoric/nat'; diff --git a/packages/zoe/src/contracts/loan/lend.js b/packages/zoe/src/contracts/loan/lend.js index ed2b7b3cbd69..0a759287a25e 100644 --- a/packages/zoe/src/contracts/loan/lend.js +++ b/packages/zoe/src/contracts/loan/lend.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { assertProposalShape } from '../../contractSupport/index.js'; diff --git a/packages/zoe/src/contracts/loan/liquidate.js b/packages/zoe/src/contracts/loan/liquidate.js index a53d4f50ee98..f90dbc69ad8d 100644 --- a/packages/zoe/src/contracts/loan/liquidate.js +++ b/packages/zoe/src/contracts/loan/liquidate.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/contracts/loan/scheduleLiquidation.js b/packages/zoe/src/contracts/loan/scheduleLiquidation.js index e8e1e183e5cc..a62b1de5bd98 100644 --- a/packages/zoe/src/contracts/loan/scheduleLiquidation.js +++ b/packages/zoe/src/contracts/loan/scheduleLiquidation.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/contracts/loan/updateDebt.js b/packages/zoe/src/contracts/loan/updateDebt.js index 74c279e6c99f..51d12e261a8f 100644 --- a/packages/zoe/src/contracts/loan/updateDebt.js +++ b/packages/zoe/src/contracts/loan/updateDebt.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { Far } from '@endo/marshal'; import { makeNotifierKit, observeNotifier } from '@agoric/notifier'; diff --git a/packages/zoe/src/contracts/mintAndSellNFT.js b/packages/zoe/src/contracts/mintAndSellNFT.js index 85020e72ae6c..8644c0e53f25 100644 --- a/packages/zoe/src/contracts/mintAndSellNFT.js +++ b/packages/zoe/src/contracts/mintAndSellNFT.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp'; import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/src/contracts/mintPayments.js b/packages/zoe/src/contracts/mintPayments.js index f70f1a452f82..1b11b8691773 100644 --- a/packages/zoe/src/contracts/mintPayments.js +++ b/packages/zoe/src/contracts/mintPayments.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/src/contracts/oracle.js b/packages/zoe/src/contracts/oracle.js index d3676c737f42..a2d93acd2372 100644 --- a/packages/zoe/src/contracts/oracle.js +++ b/packages/zoe/src/contracts/oracle.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X } from '@agoric/assert'; import { Far } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/src/contracts/otcDesk.js b/packages/zoe/src/contracts/otcDesk.js index 9d7fba4a9748..7236efa8cdc1 100644 --- a/packages/zoe/src/contracts/otcDesk.js +++ b/packages/zoe/src/contracts/otcDesk.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { assert } from '@agoric/assert'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/src/contracts/scaledPriceAuthority.js b/packages/zoe/src/contracts/scaledPriceAuthority.js index 4c3c2eb53263..df5c376bee1a 100644 --- a/packages/zoe/src/contracts/scaledPriceAuthority.js +++ b/packages/zoe/src/contracts/scaledPriceAuthority.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { AssetKind, makeIssuerKit } from '@agoric/ertp'; diff --git a/packages/zoe/src/contracts/sellItems.js b/packages/zoe/src/contracts/sellItems.js index 0b9dc36f2782..3773cba5debf 100644 --- a/packages/zoe/src/contracts/sellItems.js +++ b/packages/zoe/src/contracts/sellItems.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { Nat } from '@agoric/nat'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/src/contracts/simpleExchange.js b/packages/zoe/src/contracts/simpleExchange.js index 8fe41becb59b..b255686cd53a 100644 --- a/packages/zoe/src/contracts/simpleExchange.js +++ b/packages/zoe/src/contracts/simpleExchange.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeNotifierKit } from '@agoric/notifier'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/src/handleWarning.js b/packages/zoe/src/handleWarning.js index 4911f4c5d383..321f5d520aaf 100644 --- a/packages/zoe/src/handleWarning.js +++ b/packages/zoe/src/handleWarning.js @@ -1,5 +1,3 @@ -// @ts-check - /** * Don't trigger Node.js's UnhandledPromiseRejectionWarning. * This does not suppress any error messages. diff --git a/packages/zoe/src/instanceRecordStorage.js b/packages/zoe/src/instanceRecordStorage.js index 083020fed4dc..d0b268276f88 100644 --- a/packages/zoe/src/instanceRecordStorage.js +++ b/packages/zoe/src/instanceRecordStorage.js @@ -1,5 +1,3 @@ -// @ts-check - import { provide } from '@agoric/vat-data'; import { assertKeywordName } from './cleanProposal.js'; diff --git a/packages/zoe/src/issuerStorage.js b/packages/zoe/src/issuerStorage.js index 2771406ae3e4..065ff1cc45e8 100644 --- a/packages/zoe/src/issuerStorage.js +++ b/packages/zoe/src/issuerStorage.js @@ -1,5 +1,3 @@ -// @ts-check - import { provideDurableWeakMapStore } from '@agoric/vat-data'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/makeHandle.js b/packages/zoe/src/makeHandle.js index 1aad9c06a949..636faba8622a 100644 --- a/packages/zoe/src/makeHandle.js +++ b/packages/zoe/src/makeHandle.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert } from '@agoric/assert'; import { initEmpty } from '@agoric/store'; import { provide, defineDurableKind, makeKindHandle } from '@agoric/vat-data'; diff --git a/packages/zoe/src/objArrayConversion.js b/packages/zoe/src/objArrayConversion.js index f3b05d5d1f1a..2514fdd83861 100644 --- a/packages/zoe/src/objArrayConversion.js +++ b/packages/zoe/src/objArrayConversion.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X, q } from '@agoric/assert'; /** diff --git a/packages/zoe/src/typeGuards.js b/packages/zoe/src/typeGuards.js index 56f21c412d5f..b12ee63307e9 100644 --- a/packages/zoe/src/typeGuards.js +++ b/packages/zoe/src/typeGuards.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountShape } from '@agoric/ertp'; import { M } from '@agoric/store'; import { TimestampValueShape } from '@agoric/swingset-vat/src/vats/timer/typeGuards.js'; diff --git a/packages/zoe/src/zoeService/escrowStorage.js b/packages/zoe/src/zoeService/escrowStorage.js index 19a05c38123f..76cfd0db653d 100644 --- a/packages/zoe/src/zoeService/escrowStorage.js +++ b/packages/zoe/src/zoeService/escrowStorage.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { E } from '@endo/eventual-send'; import { assert, details as X, q } from '@agoric/assert'; diff --git a/packages/zoe/src/zoeService/feeMint.js b/packages/zoe/src/zoeService/feeMint.js index 52a34bf6e984..6348b489d340 100644 --- a/packages/zoe/src/zoeService/feeMint.js +++ b/packages/zoe/src/zoeService/feeMint.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeDurableIssuerKit, AssetKind } from '@agoric/ertp'; import { initEmpty } from '@agoric/store'; import { vivifyKindMulti, provideDurableMapStore } from '@agoric/vat-data'; diff --git a/packages/zoe/src/zoeService/installationStorage.js b/packages/zoe/src/zoeService/installationStorage.js index 144c02e01568..44eb5c34e6a8 100644 --- a/packages/zoe/src/zoeService/installationStorage.js +++ b/packages/zoe/src/zoeService/installationStorage.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X } from '@agoric/assert'; import { E } from '@endo/eventual-send'; import { diff --git a/packages/zoe/src/zoeService/instanceAdminStorage.js b/packages/zoe/src/zoeService/instanceAdminStorage.js index b06223dfe4d8..fa926ae96b29 100644 --- a/packages/zoe/src/zoeService/instanceAdminStorage.js +++ b/packages/zoe/src/zoeService/instanceAdminStorage.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { makeWeakStore } from '@agoric/store'; diff --git a/packages/zoe/src/zoeService/internal-types.js b/packages/zoe/src/zoeService/internal-types.js index 7fad609bbc4b..0a8102508d0b 100644 --- a/packages/zoe/src/zoeService/internal-types.js +++ b/packages/zoe/src/zoeService/internal-types.js @@ -1,5 +1,3 @@ -// @ts-check - /** * Create a purse for a new issuer * diff --git a/packages/zoe/src/zoeService/invitationQueries.js b/packages/zoe/src/zoeService/invitationQueries.js index 3a94085019ba..06c515bd1d2b 100644 --- a/packages/zoe/src/zoeService/invitationQueries.js +++ b/packages/zoe/src/zoeService/invitationQueries.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X } from '@agoric/assert'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/zoeService/offer/burnInvitation.js b/packages/zoe/src/zoeService/offer/burnInvitation.js index 2485b24dc94c..9099dfbde814 100644 --- a/packages/zoe/src/zoeService/offer/burnInvitation.js +++ b/packages/zoe/src/zoeService/offer/burnInvitation.js @@ -1,5 +1,3 @@ -// @ts-check - import { assert, details as X } from '@agoric/assert'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/zoeService/startInstance.js b/packages/zoe/src/zoeService/startInstance.js index 96201c50d863..776f13eafe1b 100644 --- a/packages/zoe/src/zoeService/startInstance.js +++ b/packages/zoe/src/zoeService/startInstance.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { makePromiseKit } from '@endo/promise-kit'; import { Far, passStyleOf } from '@endo/marshal'; diff --git a/packages/zoe/src/zoeService/zoe.js b/packages/zoe/src/zoeService/zoe.js index 9f08ee8ebe16..b5d1a04df287 100644 --- a/packages/zoe/src/zoeService/zoe.js +++ b/packages/zoe/src/zoeService/zoe.js @@ -1,5 +1,3 @@ -// @ts-check - /** * Zoe uses ERTP, the Electronic Rights Transfer Protocol * @@ -9,8 +7,10 @@ * currently. When the brand has an assetKind itself, AmountMath will * validate that. */ +// Ambient types. https://github.com/Agoric/agoric-sdk/issues/6512 import '@agoric/ertp/exported.js'; import '@agoric/store/exported.js'; +import '@agoric/vats/exported.js'; import '../../exported.js'; import '../internal-types.js'; diff --git a/packages/zoe/src/zoeService/zoeSeat.js b/packages/zoe/src/zoeService/zoeSeat.js index 44cf43748dbb..c81ce80c0a8c 100644 --- a/packages/zoe/src/zoeService/zoeSeat.js +++ b/packages/zoe/src/zoeService/zoeSeat.js @@ -1,5 +1,3 @@ -// @ts-check - import { makePromiseKit } from '@endo/promise-kit'; import { makeNotifierKit } from '@agoric/notifier'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/src/zoeService/zoeStorageManager.js b/packages/zoe/src/zoeService/zoeStorageManager.js index 036a9426bbf5..d01cd6c9b873 100644 --- a/packages/zoe/src/zoeService/zoeStorageManager.js +++ b/packages/zoe/src/zoeService/zoeStorageManager.js @@ -1,5 +1,3 @@ -// @ts-check - import { AssetKind, makeIssuerKit } from '@agoric/ertp'; import { Far } from '@endo/marshal'; import { diff --git a/packages/zoe/test/autoswapJig.js b/packages/zoe/test/autoswapJig.js index 1ac8065b9ef8..3bcd62756023 100644 --- a/packages/zoe/test/autoswapJig.js +++ b/packages/zoe/test/autoswapJig.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Remotable } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/offerArgsUsageContract.js b/packages/zoe/test/offerArgsUsageContract.js index 814dd1aa67fa..822473f95b13 100644 --- a/packages/zoe/test/offerArgsUsageContract.js +++ b/packages/zoe/test/offerArgsUsageContract.js @@ -1,5 +1,3 @@ -// @ts-check - /** @param {ZCF} zcf */ const start = zcf => { /** @type {OfferHandler} */ diff --git a/packages/zoe/test/privateArgsUsageContract.js b/packages/zoe/test/privateArgsUsageContract.js index 075e3f0dfdf0..b3be8fa8d2b9 100644 --- a/packages/zoe/test/privateArgsUsageContract.js +++ b/packages/zoe/test/privateArgsUsageContract.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/test/runMintContract.js b/packages/zoe/test/runMintContract.js index d05820d187ac..ab851e78167a 100644 --- a/packages/zoe/test/runMintContract.js +++ b/packages/zoe/test/runMintContract.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js b/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js index 42d425cce438..0c21af8a3ba4 100644 --- a/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js +++ b/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { makeIssuerKit, AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js index 8b8a791edbf2..811041112711 100644 --- a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js +++ b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { diff --git a/packages/zoe/test/swingsetTests/brokenContracts/vat-zoe.js b/packages/zoe/test/swingsetTests/brokenContracts/vat-zoe.js index 6295a394fba9..9b00ad01be24 100644 --- a/packages/zoe/test/swingsetTests/brokenContracts/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/brokenContracts/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/swingsetTests/helpers.js b/packages/zoe/test/swingsetTests/helpers.js index d60e79d4ac3d..0f6add5ac9b1 100644 --- a/packages/zoe/test/swingsetTests/helpers.js +++ b/packages/zoe/test/swingsetTests/helpers.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/swingsetTests/makeKind/vat-zoe.js b/packages/zoe/test/swingsetTests/makeKind/vat-zoe.js index 6295a394fba9..9b00ad01be24 100644 --- a/packages/zoe/test/swingsetTests/makeKind/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/makeKind/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/swingsetTests/offerArgs/vat-zoe.js b/packages/zoe/test/swingsetTests/offerArgs/vat-zoe.js index 6295a394fba9..9b00ad01be24 100644 --- a/packages/zoe/test/swingsetTests/offerArgs/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/offerArgs/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/swingsetTests/privateArgs/vat-zoe.js b/packages/zoe/test/swingsetTests/privateArgs/vat-zoe.js index 6295a394fba9..9b00ad01be24 100644 --- a/packages/zoe/test/swingsetTests/privateArgs/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/privateArgs/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/swingsetTests/runMint/vat-zoe.js b/packages/zoe/test/swingsetTests/runMint/vat-zoe.js index e669257b103e..a6febc090f0e 100644 --- a/packages/zoe/test/swingsetTests/runMint/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/runMint/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js index 3df061f44e88..b74e8388bb02 100644 --- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js +++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js @@ -1,5 +1,3 @@ -// @ts-check - import { M, fit } from '@agoric/store'; import '../../../exported.js'; diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js index 1d48cb928e74..4b0df509248f 100644 --- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js +++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { vivifyErtpService } from '@agoric/ertp/test/swingsetTests/ertpService/vat-ertp-service.js'; diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-zoe.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-zoe.js index 13ee8a800166..9fb213595ddb 100644 --- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe'; diff --git a/packages/zoe/test/swingsetTests/zoe/bootstrap.js b/packages/zoe/test/swingsetTests/zoe/bootstrap.js index bb192e43d227..7cc9543eb154 100644 --- a/packages/zoe/test/swingsetTests/zoe/bootstrap.js +++ b/packages/zoe/test/swingsetTests/zoe/bootstrap.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { makeIssuerKit, AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/swingsetTests/zoe/vat-alice.js b/packages/zoe/test/swingsetTests/zoe/vat-alice.js index b3de23b84730..6ce5d8d70754 100644 --- a/packages/zoe/test/swingsetTests/zoe/vat-alice.js +++ b/packages/zoe/test/swingsetTests/zoe/vat-alice.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/test/swingsetTests/zoe/vat-bob.js b/packages/zoe/test/swingsetTests/zoe/vat-bob.js index 6b0255d24df9..4ebf097d9ae1 100644 --- a/packages/zoe/test/swingsetTests/zoe/vat-bob.js +++ b/packages/zoe/test/swingsetTests/zoe/vat-bob.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/test/swingsetTests/zoe/vat-carol.js b/packages/zoe/test/swingsetTests/zoe/vat-carol.js index c5aaeef3ab48..95925e9e439b 100644 --- a/packages/zoe/test/swingsetTests/zoe/vat-carol.js +++ b/packages/zoe/test/swingsetTests/zoe/vat-carol.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/test/swingsetTests/zoe/vat-dave.js b/packages/zoe/test/swingsetTests/zoe/vat-dave.js index 52217bea0923..5cef2d6e41b3 100644 --- a/packages/zoe/test/swingsetTests/zoe/vat-dave.js +++ b/packages/zoe/test/swingsetTests/zoe/vat-dave.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/test/swingsetTests/zoe/vat-zoe.js b/packages/zoe/test/swingsetTests/zoe/vat-zoe.js index 6295a394fba9..9b00ad01be24 100644 --- a/packages/zoe/test/swingsetTests/zoe/vat-zoe.js +++ b/packages/zoe/test/swingsetTests/zoe/vat-zoe.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { makeZoeKit } from '../../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/unitTests/bounty.js b/packages/zoe/test/unitTests/bounty.js index 8638c96451b1..d8734f717112 100644 --- a/packages/zoe/test/unitTests/bounty.js +++ b/packages/zoe/test/unitTests/bounty.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/test/unitTests/contracts/brokenAutoRefund.js b/packages/zoe/test/unitTests/contracts/brokenAutoRefund.js index 1f4e0a63edaa..cad83a077bda 100644 --- a/packages/zoe/test/unitTests/contracts/brokenAutoRefund.js +++ b/packages/zoe/test/unitTests/contracts/brokenAutoRefund.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; /** diff --git a/packages/zoe/test/unitTests/contracts/useObjExample.js b/packages/zoe/test/unitTests/contracts/useObjExample.js index 9eb0e0455825..af3437524a98 100644 --- a/packages/zoe/test/unitTests/contracts/useObjExample.js +++ b/packages/zoe/test/unitTests/contracts/useObjExample.js @@ -1,5 +1,3 @@ -// @ts-check - import { Far } from '@endo/marshal'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/unitTests/installFromSource.js b/packages/zoe/test/unitTests/installFromSource.js index 01cb31b46d41..c7714387781d 100644 --- a/packages/zoe/test/unitTests/installFromSource.js +++ b/packages/zoe/test/unitTests/installFromSource.js @@ -1,5 +1,3 @@ -// @ts-check - import bundleSource from '@endo/bundle-source'; import { E } from '@endo/eventual-send'; diff --git a/packages/zoe/test/unitTests/makeOffer.js b/packages/zoe/test/unitTests/makeOffer.js index 569909ff9210..17085570bb0b 100644 --- a/packages/zoe/test/unitTests/makeOffer.js +++ b/packages/zoe/test/unitTests/makeOffer.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { assert } from '@agoric/assert'; diff --git a/packages/zoe/test/unitTests/setupBasicMints.js b/packages/zoe/test/unitTests/setupBasicMints.js index 561b840f1f4d..02567008f643 100644 --- a/packages/zoe/test/unitTests/setupBasicMints.js +++ b/packages/zoe/test/unitTests/setupBasicMints.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeIssuerKit, AmountMath } from '@agoric/ertp'; import { makeStore } from '@agoric/store'; import { makeZoeKit } from '../../src/zoeService/zoe.js'; diff --git a/packages/zoe/test/unitTests/setupMixedMints.js b/packages/zoe/test/unitTests/setupMixedMints.js index 8748f2adb93b..0b1676c8b272 100644 --- a/packages/zoe/test/unitTests/setupMixedMints.js +++ b/packages/zoe/test/unitTests/setupMixedMints.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp'; import { makeZoeKit } from '../../src/zoeService/zoe.js'; import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js'; diff --git a/packages/zoe/test/unitTests/setupNonFungibleMints.js b/packages/zoe/test/unitTests/setupNonFungibleMints.js index 92922c8a81f9..995c019eb7dc 100644 --- a/packages/zoe/test/unitTests/setupNonFungibleMints.js +++ b/packages/zoe/test/unitTests/setupNonFungibleMints.js @@ -1,5 +1,3 @@ -// @ts-check - import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp'; import { makeZoeKit } from '../../src/zoeService/zoe.js'; import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js'; diff --git a/packages/zoe/test/unitTests/test-cleanProposal.js b/packages/zoe/test/unitTests/test-cleanProposal.js index 13721ebd5d58..9579034c7710 100644 --- a/packages/zoe/test/unitTests/test-cleanProposal.js +++ b/packages/zoe/test/unitTests/test-cleanProposal.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { M } from '@agoric/store'; diff --git a/packages/zoe/test/unitTests/test-issuerStorage.js b/packages/zoe/test/unitTests/test-issuerStorage.js index acfae4d2b053..24a1173fa446 100644 --- a/packages/zoe/test/unitTests/test-issuerStorage.js +++ b/packages/zoe/test/unitTests/test-issuerStorage.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { makeIssuerKit, AssetKind } from '@agoric/ertp'; diff --git a/packages/zoe/test/unitTests/test-offerSafety.js b/packages/zoe/test/unitTests/test-offerSafety.js index 5cd0527eea08..26c085417e66 100644 --- a/packages/zoe/test/unitTests/test-offerSafety.js +++ b/packages/zoe/test/unitTests/test-offerSafety.js @@ -1,5 +1,3 @@ -// @ts-check - // 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-rightsConservation.js b/packages/zoe/test/unitTests/test-rightsConservation.js index 169e925d317c..12e6df09c553 100644 --- a/packages/zoe/test/unitTests/test-rightsConservation.js +++ b/packages/zoe/test/unitTests/test-rightsConservation.js @@ -1,5 +1,3 @@ -// @ts-check - // 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/registerFeeMintContract.js b/packages/zoe/test/unitTests/zcf/registerFeeMintContract.js index 7daeaaf7f43e..d9526337fc98 100644 --- a/packages/zoe/test/unitTests/zcf/registerFeeMintContract.js +++ b/packages/zoe/test/unitTests/zcf/registerFeeMintContract.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath } from '@agoric/ertp'; import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/test/unitTests/zcf/setupZcfTest.js b/packages/zoe/test/unitTests/zcf/setupZcfTest.js index eddbca9db903..a25feffd1371 100644 --- a/packages/zoe/test/unitTests/zcf/setupZcfTest.js +++ b/packages/zoe/test/unitTests/zcf/setupZcfTest.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import bundleSource from '@endo/bundle-source'; import { assert } from '@agoric/assert'; diff --git a/packages/zoe/test/unitTests/zcf/test-offerHandlerStorage.js b/packages/zoe/test/unitTests/zcf/test-offerHandlerStorage.js index 728647361dd7..f5ffe9e21d86 100644 --- a/packages/zoe/test/unitTests/zcf/test-offerHandlerStorage.js +++ b/packages/zoe/test/unitTests/zcf/test-offerHandlerStorage.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/test/unitTests/zcf/zcfTesterContract.js b/packages/zoe/test/unitTests/zcf/zcfTesterContract.js index 4f558135047c..d3026888ec0c 100644 --- a/packages/zoe/test/unitTests/zcf/zcfTesterContract.js +++ b/packages/zoe/test/unitTests/zcf/zcfTesterContract.js @@ -1,5 +1,3 @@ -// @ts-check - import '../../../exported.js'; import { Far } from '@endo/far'; diff --git a/packages/zoe/test/unitTests/zoe/test-createZCFVat.js b/packages/zoe/test/unitTests/zoe/test-createZCFVat.js index 9fded3bdb3bc..849683939b17 100644 --- a/packages/zoe/test/unitTests/zoe/test-createZCFVat.js +++ b/packages/zoe/test/unitTests/zoe/test-createZCFVat.js @@ -1,5 +1,3 @@ -// @ts-check - // 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-escrowStorage.js b/packages/zoe/test/unitTests/zoe/test-escrowStorage.js index b88eed447924..84442c8cc511 100644 --- a/packages/zoe/test/unitTests/zoe/test-escrowStorage.js +++ b/packages/zoe/test/unitTests/zoe/test-escrowStorage.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp'; diff --git a/packages/zoe/test/unitTests/zoe/test-instanceAdminStorage.js b/packages/zoe/test/unitTests/zoe/test-instanceAdminStorage.js index 06602803663b..63d700e41bbb 100644 --- a/packages/zoe/test/unitTests/zoe/test-instanceAdminStorage.js +++ b/packages/zoe/test/unitTests/zoe/test-instanceAdminStorage.js @@ -1,5 +1,3 @@ -// @ts-check - // 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-makeInvitation.js b/packages/zoe/test/unitTests/zoe/test-makeInvitation.js index 0e4dccdb846d..f8214b7b1863 100644 --- a/packages/zoe/test/unitTests/zoe/test-makeInvitation.js +++ b/packages/zoe/test/unitTests/zoe/test-makeInvitation.js @@ -1,5 +1,3 @@ -// @ts-check - // eslint-disable-next-line import/no-extraneous-dependencies import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { AmountMath } from '@agoric/ertp'; diff --git a/packages/zoe/test/zoeTestHelpers.js b/packages/zoe/test/zoeTestHelpers.js index 7f33bb5d32fb..cefbaed85f53 100644 --- a/packages/zoe/test/zoeTestHelpers.js +++ b/packages/zoe/test/zoeTestHelpers.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import '../exported.js'; diff --git a/packages/zoe/tools/fakeVatAdmin.js b/packages/zoe/tools/fakeVatAdmin.js index 3a219b3b1d96..d6e5809e0847 100644 --- a/packages/zoe/tools/fakeVatAdmin.js +++ b/packages/zoe/tools/fakeVatAdmin.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { makePromiseKit } from '@endo/promise-kit'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/tools/manualPriceAuthority.js b/packages/zoe/tools/manualPriceAuthority.js index 4917ac2a747a..57ec074cb48b 100644 --- a/packages/zoe/tools/manualPriceAuthority.js +++ b/packages/zoe/tools/manualPriceAuthority.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp'; import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal'; diff --git a/packages/zoe/tools/prepare-test-env-ava.js b/packages/zoe/tools/prepare-test-env-ava.js index 5a1609694137..a6e6520dde01 100644 --- a/packages/zoe/tools/prepare-test-env-ava.js +++ b/packages/zoe/tools/prepare-test-env-ava.js @@ -1,5 +1,3 @@ -// @ts-check - /** * Prepare global environment for zoe tests. * diff --git a/packages/zoe/tools/prepare-test-env.js b/packages/zoe/tools/prepare-test-env.js index ed6f8c656a6f..31f9979d4b80 100644 --- a/packages/zoe/tools/prepare-test-env.js +++ b/packages/zoe/tools/prepare-test-env.js @@ -1,5 +1,3 @@ -// @ts-check - /** * Prepare global environment for zoe tests. * diff --git a/packages/zoe/tools/priceAuthorityRegistry.js b/packages/zoe/tools/priceAuthorityRegistry.js index 77c5d7fa4c5d..0449eec42ebc 100644 --- a/packages/zoe/tools/priceAuthorityRegistry.js +++ b/packages/zoe/tools/priceAuthorityRegistry.js @@ -1,5 +1,3 @@ -// @ts-check - import { E } from '@endo/eventual-send'; import { makeStore } from '@agoric/store'; import { assert, details as X } from '@agoric/assert'; diff --git a/packages/zoe/tools/scriptedPriceAuthority.js b/packages/zoe/tools/scriptedPriceAuthority.js index e4925beb8d5f..801834c57701 100644 --- a/packages/zoe/tools/scriptedPriceAuthority.js +++ b/packages/zoe/tools/scriptedPriceAuthority.js @@ -1,5 +1,3 @@ -// @ts-check - import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp'; import { E } from '@endo/eventual-send'; import { Far } from '@endo/marshal';