Merge pull request #648 from lidofinance/feature/pretty-tests

💅 tests
lidofinance · Feb 22, 2023 · b609306 · b609306
2 parents e575177 + 9974172
commit b609306
Show file tree

Hide file tree

Showing 114 changed files with 6,309 additions and 5,042 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,5 +8,6 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
-[*.{js,yml}]
+[*.{js,yml,json,cjs}]
 indent_size = 2
+max_line_length = 120
diff --git a/.eslintrc b/.eslintrc
@@ -1,45 +1,32 @@
 {
+  "plugins": ["prettier", "standard"],
   "env": {
     "node": true,
-    "es2020": true
+    "es2022": true
   },
-  "extends": ["standard", "plugin:prettier/recommended", "prettier", "prettier/standard"],
-  "parser": "babel-eslint",
+  "extends": ["standard", "plugin:prettier/recommended"],
   "parserOptions": {
-    "ecmaVersion": 8,
-    "sourceType": "module",
+    "ecmaVersion": 2022,
+    "sourceType": "script",
     "ecmaFeatures": {
-      "jsx": true,
-      "modules": true
+      "jsx": true
     }
   },
-  "plugins": ["node", "prettier", "standard"],
-
   "rules": {
     "prettier/prettier": "error",
-    "max-len": ["warn", { "code": 140, "ignoreComments": true, "ignoreUrls": true }],
-    "no-undef": "warn",
-    "no-unused-vars": "warn",
-    "prefer-const": "warn",
     "camelcase": "off",
-    "eol-last": "warn",
-    "no-multiple-empty-lines": "warn",
-    "comma-dangle": "warn",
     "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
     "jsx-quotes": ["error", "prefer-single"],
-    "no-useless-escape": "off",
-    "linebreak-style": ["error", "unix"]
+    "no-restricted-modules": ["error", {
+        "name": "@aragon/contract-helpers-test/src/asserts",
+        "message": "Please use helpers/assert instead."
+    }]
   },
   "overrides": [
     {
       "files": ["./scripts/{**/,}*.js", "./test/{**/,}*.js", "./e2e/test/{**/,}*.js"],
       "env": {
         "mocha": true
-      },
-      "globals": {
-        "artifacts": "readonly",
-        "contract": "readonly",
-        "web3": "readonly"
       }
     }
   ]

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -51,7 +51,6 @@ jobs:
 
       - name: Run JS linters
         run: yarn lint:js
-        continue-on-error: true
 
   coverage:
     name: Solidity coverage

diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,4 @@ cli/vendor
 
 # foundry artifacts
 foundry/cache
-foundry/out
+foundry/out
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -2,7 +2,6 @@
 . "$(dirname -- "$0")/_/husky.sh"
 
 yarn compile
-yarn lint:sol
+git diff --quiet lib/abi
 
-# TODO: uncomment. it's temporarily disabled on staking_router + withdrawals-poc merge
-# yarn lint:js:fix
+yarn lint
diff --git a/.prettierrc b/.prettierrc
@@ -1,20 +1,9 @@
 {
   "singleQuote": true,
   "semi": false,
-  "trailingComma": "none",
   "bracketSpacing": true,
   "jsxBracketSameLine": false,
-  "printWidth": 120,
-  "overrides": [
-    {
-      "files": "*.sol",
-      "options": {
-        "printWidth": 120,
-        "tabWidth": 4,
-        "useTabs": false,
-        "singleQuote": false,
-        "bracketSpacing": false
-      }
-    }
-  ]
+  "options": {
+    "editorconfig": true
+  }
 }
diff --git a/apps/lido/app/package.json b/apps/lido/app/package.json
@@ -19,25 +19,25 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.6",
+    "@babel/core": "^7.21.0",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.1",
     "babel-eslint": "^10.1.0",
     "babel-plugin-styled-components": "^1.11.1",
     "copyfiles": "^2.3.0",
-    "eslint": "^7.9.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-config-standard": "^14.1.1",
+    "eslint": "^8.34.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-standard": "^17.0.0",
     "eslint-config-standard-react": "^9.2.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-hooks": "^4.1.2",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-standard": "^5.0.0",
     "parcel-bundler": "^1.12.4",
-    "prettier": "^2.1.2"
+    "prettier": "^2.8.4"
   },
   "scripts": {
     "build": "yarn sync-assets && yarn build:app && yarn build:script",

diff --git a/apps/lido/hardhat.config.js b/apps/lido/hardhat.config.js
@@ -7,7 +7,7 @@ module.exports = {
   ...baseConfig,
   paths: {
     ...baseConfig.paths,
-    root: '../..'
+    root: '../..',
   },
   defaultNetwork: process.env.NETWORK_NAME || 'localhost',
   // Aragon plugin configuration
@@ -18,6 +18,6 @@ module.exports = {
     appSrcPath: 'apps/lido/app/',
     appBuildOutputPath: 'apps/lido/dist/',
     appName: 'lido',
-    hooks // Path to script hooks
-  }
+    hooks, // Path to script hooks
+  },
 }
diff --git a/apps/lido/scripts/buidler-hooks.js b/apps/lido/scripts/buidler-hooks.js
@@ -53,5 +53,5 @@ module.exports = {
   },
 
   // Called after the app's proxy is updated with a new implementation.
-  postUpdate: async ({ proxy, log }, { web3, artifacts }) => {}
+  postUpdate: async ({ proxy, log }, { web3, artifacts }) => {},
 }
diff --git a/apps/node-operators-registry/app/package.json b/apps/node-operators-registry/app/package.json
@@ -15,25 +15,25 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.6",
+    "@babel/core": "^7.21.0",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.1",
     "babel-eslint": "^10.1.0",
     "babel-plugin-styled-components": "^1.11.1",
     "copyfiles": "^2.3.0",
-    "eslint": "^7.9.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-config-standard": "^14.1.1",
+    "eslint": "^8.34.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-standard": "^17.0.0",
     "eslint-config-standard-react": "^9.2.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-hooks": "^4.1.2",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-standard": "^5.0.0",
     "parcel-bundler": "^1.12.4",
-    "prettier": "^2.1.2"
+    "prettier": "^2.8.4"
   },
   "scripts": {
     "build": "yarn sync-assets && yarn build:app && yarn build:script",

diff --git a/apps/node-operators-registry/hardhat.config.js b/apps/node-operators-registry/hardhat.config.js
@@ -7,7 +7,7 @@ module.exports = {
   ...baseConfig,
   paths: {
     ...baseConfig.paths,
-    root: '../..'
+    root: '../..',
   },
   defaultNetwork: process.env.NETWORK_NAME || 'localhost',
   // Aragon plugin configuration
@@ -18,6 +18,6 @@ module.exports = {
     appSrcPath: 'apps/node-operators-registry/app/',
     appBuildOutputPath: 'apps/node-operators-registry/dist/',
     appName: 'node-operators-registry',
-    hooks // Path to script hooks
-  }
+    hooks, // Path to script hooks
+  },
 }
diff --git a/apps/node-operators-registry/scripts/buidler-hooks.js b/apps/node-operators-registry/scripts/buidler-hooks.js
@@ -31,5 +31,5 @@ module.exports = {
   },
 
   // Called after the app's proxy is updated with a new implementation.
-  postUpdate: async ({ proxy, log }, { web3, artifacts }) => {}
+  postUpdate: async ({ proxy, log }, { web3, artifacts }) => {},
 }
diff --git a/ava.config.cjs b/ava.config.cjs
@@ -1,5 +1,5 @@
 module.exports = {
-  require: ['@babel/register'],
-  files: ['e2e/test/**/*.test.js'],
-  concurrency: 5
+    require: ['@babel/register'],
+    files: ['e2e/test/**/*.test.js'],
+    concurrency: 5,
 }
diff --git a/gasprofile/tx-deposit.js b/gasprofile/tx-deposit.js
@@ -23,7 +23,7 @@ async function main() {
     user1,
     user2,
     // an unrelated address
-    nobody
+    nobody,
   ] = addresses
 
   const deployed = await deployDaoAndPool(appManager, voting, 100)
@@ -38,14 +38,18 @@ async function main() {
   const numKeys = 3
 
   for (let iProvider = 0; iProvider < numProviders; ++iProvider) {
-    const nosTx = await nodeOperatorRegistry.addNodeOperator(`NOS-${iProvider}`, nodeOperator, nosValidatorsLimit, { from: voting })
-    const nodeOperatorId = getEventArgument(nosTx, 'NodeOperatorAdded', 'nodeOperatorId', { decodeForAbi: NodeOperatorsRegistry._json.abi })
+    const nosTx = await nodeOperatorRegistry.addNodeOperator(`NOS-${iProvider}`, nodeOperator, nosValidatorsLimit, {
+      from: voting,
+    })
+    const nodeOperatorId = getEventArgument(nosTx, 'NodeOperatorAdded', 'nodeOperatorId', {
+      decodeForAbi: NodeOperatorsRegistry._json.abi,
+    })
 
     const data = Array.from({ length: numKeys }, (_, iKey) => {
       const n = arbitraryN.clone().addn(10 * iKey + 1000 * iProvider)
       return {
         key: pad(`0x${n.toString(16)}`, 48, 'd'),
-        sig: pad(`0x${n.toString(16)}`, 96, 'e')
+        sig: pad(`0x${n.toString(16)}`, 96, 'e'),
       }
     })
 

diff --git a/hardhat.config.aragon-apps.js b/hardhat.config.aragon-apps.js
@@ -13,6 +13,6 @@ module.exports = {
   ...baseConfig,
   aragon: {
     ...baseConfig.aragon,
-    ...aragonConfig
-  }
+    ...aragonConfig,
+  },
 }