Skip to content

Commit

Permalink
Merge pull request #18 from 5afe/feature-17-setup-lint-for-typescript
Browse files Browse the repository at this point in the history
Setup lint for typescript
  • Loading branch information
akshay-ap committed Jun 30, 2023
2 parents 69613fc + fce3346 commit 8935860
Show file tree
Hide file tree
Showing 4 changed files with 507 additions and 29 deletions.
16 changes: 16 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
env: {
browser: true,
es2021: true,
node: true,
},
extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
overrides: [],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
},
plugins: ["@typescript-eslint", "no-only-tests"],
rules: {},
};
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
"coverage": "hardhat coverage",
"fmt:sol": "prettier 'contracts/**/*.sol' -w",
"fmt:ts": "prettier 'test/**/*.ts' -w",
"lint": "yarn lint:sol",
"lint:sol": "solhint 'contracts/**/*.sol'"
"lint": "yarn lint:sol && yarn lint:ts",
"lint:sol": "solhint 'contracts/**/*.sol'",
"lint:ts": "eslint 'test/**/*.ts' --max-warnings 0 --fix"
},
"devDependencies": {
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
Expand All @@ -20,7 +21,13 @@
"@types/chai": "^4.2.0",
"@types/mocha": ">=9.1.0",
"@types/node": ">=12.0.0",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"chai": "^4.2.0",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-prettier": "^4.2.1",
"ethers": "^6.4.0",
"hardhat": "^2.15.0",
"hardhat-gas-reporter": "^1.0.8",
Expand All @@ -31,7 +38,7 @@
"solidity-coverage": "^0.8.0",
"ts-node": ">=8.0.0",
"typechain": "^8.1.0",
"typescript": ">=4.5.0"
"typescript": "~5.0.0"
},
"name": "@safe-global/safe-protocol",
"version": "0.1.0",
Expand Down
8 changes: 4 additions & 4 deletions test/SafeProtocolRegistry.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { ethers } from "hardhat";
import { loadFixture, time } from "@nomicfoundation/hardhat-toolbox/network-helpers";
import { loadFixture } from "@nomicfoundation/hardhat-toolbox/network-helpers";
import { expect } from "chai";
import { AddressZero } from "@ethersproject/constants";
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";

describe("SafeProtocolRegistry", async () => {
let deployer: SignerWithAddress, owner: SignerWithAddress, user1: SignerWithAddress, user2: SignerWithAddress;
let owner: SignerWithAddress, user1: SignerWithAddress;

async function deployContractFixture() {
[deployer, owner, user1, user2] = await ethers.getSigners();
[owner, user1] = await ethers.getSigners();
const safeProtocolRegistry = await ethers.deployContract("SafeProtocolRegistry", [owner.address]);
return { safeProtocolRegistry };
}
Expand Down Expand Up @@ -43,7 +43,7 @@ describe("SafeProtocolRegistry", async () => {

expect(await safeProtocolRegistry.connect(owner).flagComponent(AddressZero));

const [listedAt, flaggedAt] = await safeProtocolRegistry.check(AddressZero);
const [flaggedAt] = await safeProtocolRegistry.check(AddressZero);
expect(flaggedAt).to.be.gt(0);
});

Expand Down
Loading

0 comments on commit 8935860

Please sign in to comment.