prettier trailing comma across orakl (#1734)

* prettier trailing comma in core * prettier trailing comma in vrf * prettier trailing comma in cli * prettier trailing comma in util * prettier trailing comma in l2-api * prettier trailing comma in fetcher * prettier trailing comma in contracts v01
Bisonai · Jul 5, 2024 · 912bea2 · 912bea2
1 parent b1a6b61
commit 912bea2
Show file tree

Hide file tree

Showing 220 changed files with 1,988 additions and 2,091 deletions.
diff --git a/cli/.eslintrc b/cli/.eslintrc
@@ -7,16 +7,10 @@
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended"
   ],
-  "plugins": [
-    "prettier",
-    "@typescript-eslint",
-    "import"
-  ],
+  "plugins": ["prettier", "@typescript-eslint", "import"],
   "rules": {
     "no-throw-literal": "error",
-    "prettier/prettier": [
-      "error"
-    ],
+    "prettier/prettier": ["error"],
     "@typescript-eslint/ban-ts-comment": "off",
     "import/extensions": [
       "error",
@@ -35,9 +29,7 @@
       }
     }
   ],
-  "ignorePatterns": [
-    "src/cli/orakl-cli/dist/**"
-  ],
+  "ignorePatterns": ["src/cli/orakl-cli/dist/**"],
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": 2022,

diff --git a/cli/.prettierrc b/cli/.prettierrc
@@ -2,7 +2,7 @@
   "useTabs": false,
   "tabWidth": 2,
   "singleQuote": true,
-  "trailingComma": "none",
+  "trailingComma": "all",
   "printWidth": 100,
   "semi": false
 }
diff --git a/cli/jest.config.ts b/cli/jest.config.ts
@@ -4,15 +4,15 @@ const jestConfig: JestConfigWithTsJest = {
   verbose: true,
   preset: 'ts-jest/presets/default-esm',
   moduleNameMapper: {
-    '^(\\.{1,2}/.*)\\.js$': '$1'
+    '^(\\.{1,2}/.*)\\.js$': '$1',
   },
   transform: {
     '^.+\\.(t|j)s$': [
       'ts-jest',
       {
-        useESM: true
-      }
-    ]
+        useESM: true,
+      },
+    ],
   },
   moduleFileExtensions: ['js', 'json', 'ts'],
   rootDir: '.',
@@ -26,7 +26,7 @@ const jestConfig: JestConfigWithTsJest = {
   testEnvironment: 'node',
   maxConcurrency: 1,
   maxWorkers: 1,
-  bail: true
+  bail: true,
 }
 
 export default jestConfig
diff --git a/cli/src/adapter.ts b/cli/src/adapter.ts
@@ -15,46 +15,46 @@ export function adapterSub() {
   const list = command({
     name: 'list',
     args: {},
-    handler: listHandler(true)
+    handler: listHandler(true),
   })
 
   const insert = command({
     name: 'insert',
     args: {
       data: option({
         type: ReadFile,
-        long: 'source'
-      })
+        long: 'source',
+      }),
     },
-    handler: insertHandler()
+    handler: insertHandler(),
   })
 
   const remove = command({
     name: 'remove',
     args: {
-      id: idOption
+      id: idOption,
     },
-    handler: removeHandler()
+    handler: removeHandler(),
   })
 
   const hash = command({
     name: 'hash',
     args: {
       verify: flag({
         type: cmdboolean,
-        long: 'verify'
+        long: 'verify',
       }),
       data: option({
         type: ReadFile,
-        long: 'source'
-      })
+        long: 'source',
+      }),
     },
-    handler: hashHandler()
+    handler: hashHandler(),
   })
 
   return subcommands({
     name: 'adapter',
-    cmds: { list, insert, remove, hash }
+    cmds: { list, insert, remove, hash },
   })
 }
 

diff --git a/cli/src/aggregator.ts b/cli/src/aggregator.ts
@@ -5,7 +5,7 @@ import {
   flag,
   option,
   string as cmdstring,
-  subcommands
+  subcommands,
 } from 'cmd-ts'
 import { IAggregator, ReadFile } from './cli-types.js'
 import { ORAKL_NETWORK_API_URL, WORKER_SERVICE_HOST, WORKER_SERVICE_PORT } from './settings.js'
@@ -15,7 +15,7 @@ import {
   fetcherTypeOptionalOption,
   idOption,
   isOraklNetworkApiHealthy,
-  isServiceHealthy
+  isServiceHealthy,
 } from './utils.js'
 
 const AGGREGATOR_ENDPOINT = buildUrl(ORAKL_NETWORK_API_URL, 'aggregator')
@@ -33,50 +33,50 @@ export function aggregatorSub() {
     name: 'list',
     args: {
       active: flag({
-        long: 'active'
+        long: 'active',
       }),
-      chain: chainOptionalOption
+      chain: chainOptionalOption,
     },
-    handler: listHandler(true)
+    handler: listHandler(true),
   })
 
   const insert = command({
     name: 'insert',
     args: {
       data: option({
         type: ReadFile,
-        long: 'source'
+        long: 'source',
       }),
       chain: option({
         type: cmdstring,
-        long: 'chain'
+        long: 'chain',
       }),
-      fetcherType: fetcherTypeOptionalOption
+      fetcherType: fetcherTypeOptionalOption,
     },
-    handler: insertHandler()
+    handler: insertHandler(),
   })
 
   const remove = command({
     name: 'remove',
     args: {
-      id: idOption
+      id: idOption,
     },
-    handler: removeHandler()
+    handler: removeHandler(),
   })
 
   const hash = command({
     name: 'hash',
     args: {
       verify: flag({
         type: cmdboolean,
-        long: 'verify'
+        long: 'verify',
       }),
       data: option({
         type: ReadFile,
-        long: 'source'
-      })
+        long: 'source',
+      }),
     },
-    handler: hashHandler()
+    handler: hashHandler(),
   })
 
   const active = command({
@@ -85,36 +85,36 @@ export function aggregatorSub() {
       host: option({
         type: cmdstring,
         long: 'host',
-        defaultValue: () => WORKER_SERVICE_HOST
+        defaultValue: () => WORKER_SERVICE_HOST,
       }),
       port: option({
         type: cmdstring,
         long: 'port',
-        defaultValue: () => String(WORKER_SERVICE_PORT)
-      })
+        defaultValue: () => String(WORKER_SERVICE_PORT),
+      }),
     },
-    handler: activeHandler()
+    handler: activeHandler(),
   })
 
   const activate = command({
     name: 'activate',
     args: {
       aggregatorHash: option({
         type: cmdstring,
-        long: 'aggregatorHash'
+        long: 'aggregatorHash',
       }),
       host: option({
         type: cmdstring,
         long: 'host',
-        defaultValue: () => WORKER_SERVICE_HOST
+        defaultValue: () => WORKER_SERVICE_HOST,
       }),
       port: option({
         type: cmdstring,
         long: 'port',
-        defaultValue: () => String(WORKER_SERVICE_PORT)
-      })
+        defaultValue: () => String(WORKER_SERVICE_PORT),
+      }),
     },
-    handler: activateHandler()
+    handler: activateHandler(),
   })
 
   const deactivate = command({
@@ -123,25 +123,25 @@ export function aggregatorSub() {
     args: {
       aggregatorHash: option({
         type: cmdstring,
-        long: 'aggregatorHash'
+        long: 'aggregatorHash',
       }),
       host: option({
         type: cmdstring,
         long: 'host',
-        defaultValue: () => WORKER_SERVICE_HOST
+        defaultValue: () => WORKER_SERVICE_HOST,
       }),
       port: option({
         type: cmdstring,
         long: 'port',
-        defaultValue: () => String(WORKER_SERVICE_PORT)
-      })
+        defaultValue: () => String(WORKER_SERVICE_PORT),
+      }),
     },
-    handler: deactivateHandler()
+    handler: deactivateHandler(),
   })
 
   return subcommands({
     name: 'aggregator',
-    cmds: { list, insert, remove, hash, active, activate, deactivate }
+    cmds: { list, insert, remove, hash, active, activate, deactivate },
   })
 }
 
@@ -181,7 +181,7 @@ export function insertHandler() {
   async function wrapper({
     data,
     chain,
-    fetcherType
+    fetcherType,
   }: {
     data
     chain: string
@@ -225,7 +225,7 @@ export function hashHandler() {
       const aggregator = data as IAggregator
       const aggregatorWithCorrectHash = (
         await axios.post(endpoint, aggregator, {
-          params: { verify }
+          params: { verify },
         })
       ).data
       console.dir(aggregatorWithCorrectHash, { depth: null })
@@ -262,7 +262,7 @@ export function activateHandler() {
   async function wrapper({
     host,
     port,
-    aggregatorHash
+    aggregatorHash,
   }: {
     host: string
     port: string
@@ -273,7 +273,7 @@ export function activateHandler() {
 
     const activateAggregatorEndpoint = buildUrl(
       aggregatorServiceEndpoint,
-      `activate/${aggregatorHash}`
+      `activate/${aggregatorHash}`,
     )
 
     try {
@@ -292,7 +292,7 @@ export function deactivateHandler() {
   async function wrapper({
     host,
     port,
-    aggregatorHash
+    aggregatorHash,
   }: {
     host: string
     port: string
@@ -303,7 +303,7 @@ export function deactivateHandler() {
 
     const deactivateAggregatorEndpoint = buildUrl(
       aggregatorServiceEndpoint,
-      `deactivate/${aggregatorHash}`
+      `deactivate/${aggregatorHash}`,
     )
 
     try {

diff --git a/cli/src/chain.ts b/cli/src/chain.ts
@@ -13,31 +13,31 @@ export function chainSub() {
   const list = command({
     name: 'list',
     args: {},
-    handler: listHandler(true)
+    handler: listHandler(true),
   })
 
   const insert = command({
     name: 'insert',
     args: {
       name: option({
         type: cmdstring,
-        long: 'name'
-      })
+        long: 'name',
+      }),
     },
-    handler: insertHandler()
+    handler: insertHandler(),
   })
 
   const remove = command({
     name: 'remove',
     args: {
-      id: idOption
+      id: idOption,
     },
-    handler: removeHandler()
+    handler: removeHandler(),
   })
 
   return subcommands({
     name: 'chain',
-    cmds: { list, insert, remove }
+    cmds: { list, insert, remove },
   })
 }
 

diff --git a/cli/src/cli-types.ts b/cli/src/cli-types.ts
@@ -19,7 +19,7 @@ export async function readFileFromSource(source: string) {
 export const ReadFile: Type<string, string> = {
   async from(source) {
     return await readFileFromSource(source)
-  }
+  },
 }
 
 export interface ITransaction {