Linter update and fixes

.eslintrc.js

@@ -21,5 +21,7 @@ module.exports = {
     sourceType: 'module',
   },
   plugins: ['@typescript-eslint'],
-  rules: {},
+  rules: {
+    '@typescript-eslint/ban-ts-comment': 'off',
+  },
 }

.github/workflows/prettier.yaml → .github/workflows/lint.yaml

@@ -19,15 +19,8 @@ jobs:
       - name: Install dependencies
         run: npm install # npm install instead of npm ci is used to prevent unsupported platform errors due to the fsevents sub-dependency --no-optional
 
-      - name: Run lint check
-        run: npm run lint:ci
-
-      - name: Upload ESLint report
-        if: always()
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
-        with:
-          name: eslint-report
-          path: ./eslint-report.json
-
-      - name: Run Prettier
+      - name: Run Prettier check
         run: npm run prettier:check
+
+      - name: Run lint check
+        run: npm run lint:check

package.json

@@ -10,9 +10,9 @@
     "test": "jest",
     "test:ci": "jest --coverage",
     "test:package": "jest --config jest.config.package.js",
-    "lint:check": "eslint --ext js,jsx,ts,tsx .",
-    "lint:ci": "eslint --ext js,jsx,ts,tsx . -f json -o eslint-report.json",
-    "lint:fix": "eslint --ext js,jsx,ts,tsx . --fix",
+    "lint:check": "eslint '{src,test}/**/*.ts'",
+    "lint:fix": "eslint '{src,test}/**/*.ts' --fix",
+    "lint:ci": "eslint '{src,test}/**/*.ts' --max-warnings=0 -f json -o eslint-report.json",
     "prettier:check": "prettier --check . && tsc --noEmit",
     "prettier:fix": "npx prettier -w ."
   },
@@ -36,29 +36,21 @@
   ],
   "homepage": "https://github.com/smartcontractkit/functions-toolkit#readme",
   "devDependencies": {
-    "@babel/core": "7.21.8",
-    "@babel/preset-env": "7.21.5",
-    "@babel/preset-typescript": "7.21.5",
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
     "@types/jest": "^29.5.1",
     "@types/node": "^18.16.3",
     "@types/prettier": "^2.7.2",
+    "cpy-cli": "^5.0.0",
     "@typescript-eslint/eslint-plugin": "^6.7.5",
     "@typescript-eslint/parser": "^6.7.5",
-    "babel-loader": "9.1.2",
-    "browserify": "17.0.0",
-    "cpy-cli": "^5.0.0",
     "eslint": "^8.51.0",
-    "esmify": "2.1.1",
     "jest": "^29.5.0",
     "nock": "^13.3.1",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",
     "ts-jest": "^29.1.0",
-    "typescript": "^5.0.4",
-    "webpack": "5.82.1",
-    "webpack-cli": "5.1.1"
+    "typescript": "^5.0.4"
   },
   "prettier": {
     "printWidth": 100,

test/integration/fetchRequestCommitment.test.ts

@@ -1,4 +1,4 @@
-import { fetchRequestCommitment, RequestCommitment, SubscriptionManager } from '../../src'
+import { fetchRequestCommitment, SubscriptionManager } from '../../src'
 import { setupLocalTestnetFixture } from '../utils'
 
 import { Contract, Wallet, utils, providers } from 'ethers'
@@ -7,7 +7,6 @@ describe('fetchRequestCommitment', () => {
   let donId: string
   let linkTokenAddress: string
   let functionsRouterAddress: string
-  let functionsCoordinatorAddress: string
   let exampleClient: Contract
   let close: () => Promise<void>
   let allowlistedUser_A: Wallet
@@ -17,7 +16,6 @@ describe('fetchRequestCommitment', () => {
     donId = testSetup.donId
     linkTokenAddress = testSetup.linkTokenAddress
     functionsRouterAddress = testSetup.functionsRouterAddress
-    functionsCoordinatorAddress = testSetup.functionsCoordinator.address
     exampleClient = testSetup.exampleConsumer
     close = testSetup.close
     allowlistedUser_A = testSetup.user_A

test/integration/integration.test.ts

@@ -173,7 +173,7 @@ describe('Functions toolkit classes', () => {
 
         const subscriptionId = await subscriptionManager.createSubscription()
 
-        const addTx = await subscriptionManager.addConsumer({
+        await subscriptionManager.addConsumer({
           subscriptionId,
           consumerAddress,
           txOptions: {
@@ -197,7 +197,7 @@ describe('Functions toolkit classes', () => {
 
         const subscriptionIdBigInt = await subscriptionManager.createSubscription()
         const subscriptionId = subscriptionIdBigInt.toString()
-        const addConsumerTxReceipt = await subscriptionManager.addConsumer({
+        await subscriptionManager.addConsumer({
           subscriptionId,
           consumerAddress,
         })
@@ -279,7 +279,7 @@ describe('Functions toolkit classes', () => {
         await subscriptionManager_B.initialize()
 
         const unOwnedSubId = await subscriptionManager_A.createSubscription()
-        const _ = await subscriptionManager_B.createSubscription()
+        await subscriptionManager_B.createSubscription()
 
         await expect(async () => {
           await subscriptionManager_B.addConsumer({ subscriptionId: unOwnedSubId, consumerAddress })
@@ -1393,6 +1393,7 @@ describe('Functions toolkit classes', () => {
         const sm = new SecretsManager({ signer: allowlistedUser_A, functionsRouterAddress, donId })
         expect(() =>
           sm.buildDONHostedEncryptedSecretsReference({
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             slotId: 'invalid' as any,
             version: 1,
           }),
@@ -1418,6 +1419,7 @@ describe('Functions toolkit classes', () => {
         expect(() =>
           sm.buildDONHostedEncryptedSecretsReference({
             slotId: 1,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             version: 'invalid' as any,
           }),
         ).toThrow('Invalid version')

test/unit/buildRequestCBOR.test.ts

@@ -22,6 +22,7 @@ describe('buildRequestCBOR', () => {
         codeLocation: 'invalid',
         codeLanguage: 0,
         source: 'test',
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any),
     ).toThrow('Invalid codeLocation')
 
@@ -40,6 +41,7 @@ describe('buildRequestCBOR', () => {
         codeLocation: 0,
         codeLanguage: 'invalid',
         source: 'test',
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any),
     ).toThrow('Invalid codeLanguage')
 
@@ -48,6 +50,7 @@ describe('buildRequestCBOR', () => {
         codeLocation: 0,
         codeLanguage: 1,
         source: 'test',
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any),
     ).toThrow('Invalid codeLanguage')
   })
@@ -57,6 +60,7 @@ describe('buildRequestCBOR', () => {
       buildRequestCBOR({
         codeLocation: 0,
         codeLanguage: 0,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         source: 123 as any,
       }),
     ).toThrow('Invalid source')
@@ -82,6 +86,7 @@ describe('buildRequestCBOR', () => {
         source: 'test',
         encryptedSecretsReference: '0xabcdef',
         secretsLocation: 3,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any),
     ).toThrow('Invalid secretsLocation')
   })
@@ -92,6 +97,7 @@ describe('buildRequestCBOR', () => {
         codeLocation: 0,
         codeLanguage: 0,
         source: 'test',
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         args: [123 as any],
       }),
     ).toThrow('Invalid args')
@@ -101,6 +107,7 @@ describe('buildRequestCBOR', () => {
         codeLocation: 0,
         codeLanguage: 0,
         source: 'test',
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         args: ['valid', 123 as any],
       }),
     ).toThrow('Invalid args')

test/unit/decode_result.test.ts

@@ -57,7 +57,8 @@ describe('decodeResult', () => {
   it('throws error if expectedDataType is invalid', () => {
     // @ts-ignore
     expect(() => decodeResult('0x123ABC', 'invalid')).toThrow(
-      /not valid. Must be one of the following/,
+      // eslint-disable-next-line no-regex-spaces
+      /not valid.  Must be one of the following/,
     )
   })
   it('throws  with invalid hex', () => {

test/unit/simulateScript.test.ts

@@ -239,6 +239,7 @@ describe('simulateScript', () => {
   describe('validation errors', () => {
     it('should throw error for invalid source', async () => {
       const result = simulateScript({
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         source: 123 as any,
       })
 
@@ -248,6 +249,7 @@ describe('simulateScript', () => {
     it('should throw error for invalid secrets', async () => {
       const result = simulateScript({
         source: `return`,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         secrets: { bad: 1 } as any,
       })
 
@@ -257,6 +259,7 @@ describe('simulateScript', () => {
     it('should throw error for invalid args', async () => {
       const result = simulateScript({
         source: `return`,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         args: 123 as any,
       })
 
@@ -266,6 +269,7 @@ describe('simulateScript', () => {
     it('should throw error when an element of args is not a string', async () => {
       const result = simulateScript({
         source: `return`,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         args: [123] as any,
       })
 
@@ -275,6 +279,7 @@ describe('simulateScript', () => {
     it('should throw error for invalid bytesArgs', async () => {
       const result = simulateScript({
         source: `return`,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         bytesArgs: 123 as any,
       })
 
@@ -284,6 +289,7 @@ describe('simulateScript', () => {
     it('should throw error when an element of bytesArgs is not a hex string', async () => {
       const result = simulateScript({
         source: `return`,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         bytesArgs: ['invalid'] as any,
       })
 

test/utils/index.ts

@@ -52,6 +52,7 @@ export const setupLocalTestnetFixture = async (
       utils.formatBytes32String(localFunctionsTestnet.donId),
     )
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_admin, user_A, user_B_NoLINK, subFunder, _] = createTestWallets(
     localFunctionsTestnet.server,
     port,