chore: several tooling improvements and fixes

tmigone · tmigone · commit 3da8723ee149 · 2022-05-12T14:34:38.000-03:00
- remove several unused dependencies
- lint all js and ts files
- prettify all js, ts and json files
- install husky hooks on yarn install
- use lint-staged

Signed-off-by: Tomás Migone &lt;tomas@edgeandnode.com&gt;
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint
+npx --no-install lint-staged
diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,4 @@
-
+build
+reports
+cache
+coverage.json
diff --git a/cli/mockData/account-metadata/compound.json b/cli/mockData/account-metadata/compound.json
@@ -5,4 +5,4 @@
   "name": "Compound developer",
   "website": "https://compound.finance",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/decentraland.json b/cli/mockData/account-metadata/decentraland.json
@@ -5,4 +5,4 @@
   "name": "Decentraland developer",
   "website": "https://decentraland.io",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/ens.json b/cli/mockData/account-metadata/ens.json
@@ -5,4 +5,4 @@
   "name": "ENS developer",
   "website": "https://ens.domains/",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/livepeer.json b/cli/mockData/account-metadata/livepeer.json
@@ -5,4 +5,4 @@
   "name": "Adam",
   "website": "https://adam.com/",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/maker.json b/cli/mockData/account-metadata/maker.json
@@ -5,4 +5,4 @@
   "name": "Maker deve",
   "website": "https://maker.io/",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/melon.json b/cli/mockData/account-metadata/melon.json
@@ -5,4 +5,4 @@
   "name": "Melon developer",
   "website": "https://melon.finance/",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/moloch.json b/cli/mockData/account-metadata/moloch.json
@@ -5,4 +5,4 @@
   "name": "Moloch dev",
   "website": "https://moloch.io/",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/origin.json b/cli/mockData/account-metadata/origin.json
@@ -5,4 +5,4 @@
   "name": "Origin dev",
   "website": "https://origin-dev.io",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/thegraph.json b/cli/mockData/account-metadata/thegraph.json
@@ -5,4 +5,4 @@
   "name": "Dave Kajpust",
   "website": "https://kajpust.com/",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/account-metadata/uniswap.json b/cli/mockData/account-metadata/uniswap.json
@@ -5,4 +5,4 @@
   "name": "Ian",
   "website": "https://ian.com",
   "isOrganization": true
-}
+}
diff --git a/cli/mockData/subgraph-metadata/compound.json b/cli/mockData/subgraph-metadata/compound.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmeMR3qK7wfAuSns4PpdFVZZcsCoLa7wEPQbrZTBQNKGWq",
   "codeRepository": "https://github.com/graphprotocol/compound-V2-subgraph",
   "website": "https://compound.finance/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/decentraland.json b/cli/mockData/subgraph-metadata/decentraland.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmVMtgVvEJLqmH3PZzcYVp5t8ni1v61e2M1rDVkcRo9WCz",
   "codeRepository": "https://github.com/graphprotocol/decentraland-subgraph",
   "website": "https://decentraland.org/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/ens.json b/cli/mockData/subgraph-metadata/ens.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmUqD4MMAXQvbNX3FbWNP43gmDFFdQPmQrn8CT9kNEb7Rs",
   "codeRepository": "https://github.com/ensdomains/ens-subgraph",
   "website": "https://ens.domains/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/livepeer.json b/cli/mockData/subgraph-metadata/livepeer.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmcTyMcTpkSrRs8Q7tUBPqA6ektwL7x5DEZCsEpoveXxe1",
   "codeRepository": "https://github.com/livepeer/livepeerjs/tree/master/packages/subgraph",
   "website": "https://livepeer.org/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/maker.json b/cli/mockData/subgraph-metadata/maker.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmdJ2g7fbk1XDh24NBCwWNSUZ8jY1XxpG9ukXhLAhanP6C",
   "codeRepository": "https://github.com/makerdao",
   "website": "https://makerdao.com/en/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/melon.json b/cli/mockData/subgraph-metadata/melon.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmQpuowYwm5c7XYXmEbSGsP6EqTU7vEWBJGN3NhJLQZ7wq",
   "codeRepository": "https://github.com/melonproject/melon-subgraph",
   "website": "https://melonport.com"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/moloch.json b/cli/mockData/subgraph-metadata/moloch.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmSLfbgC7wrmufnr4ekLJtzYT1YfoQFPRsFpCRrHsxr8ED",
   "codeRepository": "https://github.com/MolochVentures/moloch-monorepo/",
   "website": "https://molochdao.com/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/origin.json b/cli/mockData/subgraph-metadata/origin.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmdNkVFiDjStPhCgQfnLUg8agwCK5yQQfmfivyeJJHDeDf",
   "codeRepository": "https://github.com/graphprotocol/origin-subgraph",
   "website": "https://www.originprotocol.com/en"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/thegraph.json b/cli/mockData/subgraph-metadata/thegraph.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmTFK5DZc58XrTqhuuDTYoaq29ndnwoHX5TAW1bZr5EMpq",
   "codeRepository": "https://github.com/graphprotocol/graph-network-subgraph",
   "website": "https://thegraph.com/"
-}
+}
diff --git a/cli/mockData/subgraph-metadata/uniswap.json b/cli/mockData/subgraph-metadata/uniswap.json
@@ -4,4 +4,4 @@
   "image": "https://api.thegraph.com/ipfs/api/v0/cat?arg=QmSaK8PKxNWPv3QMMdjp8bYvQxnpU277DowPMwCUr7dAxS",
   "codeRepository": "https://github.com/graphprotocol/uniswap-subgraph",
   "website": "https://uniswap.info/"
-}
+}
diff --git a/cli/mockData/version-metadata/firstVersion.json b/cli/mockData/version-metadata/firstVersion.json
@@ -1,4 +1,4 @@
 {
   "label": "v0.0.1",
   "description": "First subgraph version"
-}
+}
diff --git a/cli/mockData/version-metadata/secondVersion.json b/cli/mockData/version-metadata/secondVersion.json
@@ -1,4 +1,4 @@
 {
   "label": "v0.2.0",
   "description": "Second Version"
-}
+}
diff --git a/package.json b/package.json
@@ -17,9 +17,7 @@
   "devDependencies": {
     "@commitlint/cli": "^13.2.1",
     "@commitlint/config-conventional": "^13.2.0",
-    "@ethersproject/contracts": "^5.4.1",
     "@ethersproject/experimental": "^5.4.0",
-    "@ethersproject/transactions": "^5.4.0",
     "@graphprotocol/common-ts": "^1.6.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-etherscan": "^2.1.1",
@@ -40,23 +38,15 @@
     "@types/yargs": "^16.0.0",
     "@typescript-eslint/eslint-plugin": "^4.0.0",
     "@typescript-eslint/parser": "^4.0.0",
-    "@typescript-eslint/typescript-estree": "^4.0.0",
     "@urql/core": "^2.1.3",
-    "axios": "^0.21.1",
     "bignumber.js": "^9.0.0",
     "chai": "^4.3.4",
     "cli-table": "^0.3.6",
     "dotenv": "^9.0.0",
     "eslint": "^7.24.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-config-standard": "^16.0.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-mocha-no-only": "^1.1.1",
     "eslint-plugin-no-only-tests": "^2.4.0",
-    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-promise": "^5.0.0",
-    "eslint-plugin-standard": "^4.1.0",
     "ethereum-waffle": "^3.3.0",
     "graphql-tag": "^2.12.4",
     "hardhat": "^2.2.0",
@@ -70,23 +60,21 @@
     "ipfs-http-client": "47.0.1",
     "isomorphic-fetch": "^3.0.0",
     "lint-staged": "^10.5.4",
-    "minimist": "^1.2.5",
     "p-queue": "^6.6.1",
     "prettier": "^2.2.1",
     "prettier-plugin-solidity": "^1.0.0-beta.9",
     "solhint": "^3.3.6",
     "solhint-plugin-prettier": "^0.0.5",
     "solidity-coverage": "^0.7.16",
-    "ts-generator": "^0.1.1",
     "ts-node": "^9.1.1",
     "typechain": "^5.0.0",
     "typescript": "^4.2.4",
     "winston": "^3.3.3",
     "yaml": "^1.10.2",
-    "yargs": "^17.0.0",
-    "yargs-parser": "^13.1.2"
+    "yargs": "^17.0.0"
   },
   "scripts": {
+    "prepare": "husky install",
     "prepublishOnly": "scripts/prepublish",
     "build": "SKIP_LOAD=true scripts/build",
     "clean": "rm -rf build/ cache/ dist/",
@@ -102,12 +90,12 @@
     "test:coverage": "scripts/coverage",
     "lint": "yarn lint:ts && yarn lint:sol",
     "lint:fix": "yarn lint:ts:fix && yarn lint:sol:fix",
-    "lint:ts": "eslint '*/**/*.{js,ts}'",
-    "lint:ts:fix": "yarn prettier:ts && eslint '*/**/*.{js,ts}' --fix",
-    "lint:sol": "solhint './contracts/**/*.sol'",
-    "lint:sol:fix": "yarn prettier:sol && solhint --fix './contracts/**/*.sol'",
+    "lint:ts": "eslint '**/*.{js,ts}'",
+    "lint:ts:fix": "yarn prettier:ts && eslint '**/*.{js,ts}' --fix",
+    "lint:sol": "solhint 'contracts/**/*.sol'",
+    "lint:sol:fix": "yarn prettier:sol && solhint --fix 'contracts/**/*.sol'",
     "prettier": "yarn prettier:ts && yarn prettier:sol",
-    "prettier:ts": "prettier --write 'test/**/*.ts'",
+    "prettier:ts": "prettier --write '**/*.{js,ts,json}'",
     "prettier:sol": "prettier --write 'contracts/**/*.sol'",
     "analyze": "scripts/analyze",
     "myth": "scripts/myth",
@@ -117,19 +105,19 @@
     "size": "hardhat size-contracts"
   },
   "lint-staged": {
-    "contracts/*.sol": [
-      "prettier --write"
+    "contracts/**/*.sol": [
+      "yarn lint:sol:fix"
     ],
-    "test/**/*.ts": [
-      "prettier --write"
+    "**/*.ts": [
+      "yarn lint:ts:fix"
+    ],
+    "**/*.js": [
+      "yarn lint:ts:fix"
+    ],
+    "**/*.json": [
+      "yarn lint:ts:fix"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "pre-push": "git diff HEAD --quiet && yarn lint && yarn test"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/graphprotocol/contracts.git"
diff --git a/slither.config.json b/slither.config.json
@@ -1,6 +1,6 @@
 {
-    "hardhat_artifacts_directory": "./build/contracts",
-    "filter_paths": "contracts/bancor/.*|contracts/tests/.*|contracts/staking/libs/Cobbs.*|contracts/staking/libs/LibFixedMath.*|contracts/staking/libs/MathUtils.*",
-    "detectors_to_exclude": "similar-names,naming-convention",
-    "exclude_dependencies": true
-}
+  "hardhat_artifacts_directory": "./build/contracts",
+  "filter_paths": "contracts/bancor/.*|contracts/tests/.*|contracts/staking/libs/Cobbs.*|contracts/staking/libs/LibFixedMath.*|contracts/staking/libs/MathUtils.*",
+  "detectors_to_exclude": "similar-names,naming-convention",
+  "exclude_dependencies": true
+}
diff --git a/test/rewards/rewards.test.ts b/test/rewards/rewards.test.ts
@@ -573,7 +573,6 @@ describe('Rewards', () => {
       }
 
       it('should distribute rewards on closed allocation and stake', async function () {
-
         // Align with the epoch boundary
         await advanceToNextEpoch(epochManager)
         // Setup
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1 +1,4 @@ @@
+-
 +build
 +reports
 +cache
 +coverage.json