Skip to content

Commit 9bbc2c7

Browse files
committed
chore: replace ethlint with solhint
1 parent 6b89a6c commit 9bbc2c7

File tree

5 files changed

+31
-18
lines changed

5 files changed

+31
-18
lines changed

.solhint.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"extends": "solhint:recommended",
3+
"rules": {
4+
"compiler-version": [
5+
"error",
6+
">=0.6.0 <0.9.0"
7+
],
8+
"constructor-syntax": "warn",
9+
"func-param-name-mixedcase": "warn",
10+
"func-visibility": [
11+
"warn",
12+
{
13+
"ignoreConstructors": true
14+
}
15+
],
16+
"modifier-name-mixedcase": "warn",
17+
"no-empty-blocks": "off",
18+
"no-inline-assembly": "off",
19+
"reason-string": [
20+
"warn",
21+
{
22+
"maxLength": 80
23+
}
24+
]
25+
}
26+
}

.solhintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules
2+
flattened

.soliumignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.soliumrc.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
"compile:flattened": "npx truffle compile --all --config flattened-config.js ",
1818
"coverage": "solidity-coverage",
1919
"flatten": "node scripts/flatten.js",
20-
"fmt": "solium -d contracts && eslint ./test",
21-
"fmt!": "solium -d contracts --fix && eslint ./test --fix",
20+
"fmt!": "solhint --max-warnings 0 \"contracts/**/*.sol\" --fix && solhint \"test/**/*.sol\" --fix && eslint ./scripts/*.js --fix && eslint \"test/**/*.js\" --no-error-on-unmatched-pattern --fix",
21+
"fmt": "solhint --max-warnings 0 \"contracts/**/*.sol\" && solhint \"test/**/*.sol\" && eslint ./scripts/*.js && eslint \"test/**/*.js\" --no-error-on-unmatched-pattern",
2222
"lint": "eslint ./test",
2323
"lint:fix": "eslint ./test --fix",
2424
"migrate": "npx truffle migrate",
2525
"migrate:flattened": "npm run flatten && npx truffle migrate --config flattened-config.js",
2626
"postinstall": "node scripts/postinstall.js",
27-
"solium": "solium -d contracts",
28-
"solium:fix": "solium -d contracts --fix",
2927
"toolkit": "npx witnet-toolkit",
3028
"try": "npm run compile:requests && npx witnet-toolkit try-data-request --from-solidity ./contracts/requests/",
3129
"verify:flattened": "npx truffle run verify"
@@ -50,11 +48,11 @@
5048
"eslint-plugin-node": "^8.0.1",
5149
"eslint-plugin-promise": "^4.1.1",
5250
"eslint-plugin-standard": "^4.0.1",
53-
"ethlint": "^1.2.5",
5451
"ganache-cli": "^6.8.2",
5552
"node-eval": "^2.0.0",
5653
"npx": "^10.2.2",
5754
"protocol-buffers": "^4.1.0",
55+
"solhint": "3.3.4",
5856
"solidity-coverage": "^0.5.11",
5957
"truffle": "^5.1.10",
6058
"truffle-assertions": "^0.9.2",

0 commit comments

Comments
 (0)