diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-11 07:20:52 +0800 |
|---|---|---|
| committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-13 01:19:33 +0800 |
| commit | 8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77 (patch) | |
| tree | 57ef501ec0f54fe30647576cc0862630e044eb1e /contracts/tokens | |
| parent | 07a0170f34e220372bfca6423e5b2f98757addac (diff) | |
| download | dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.gz dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.bz2 dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.lz dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.xz dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.zst dexon-sol-tools-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.zip | |
Re-use solhint configuration
Diffstat (limited to 'contracts/tokens')
| -rw-r--r-- | contracts/tokens/.solhint.json | 20 | ||||
| -rw-r--r-- | contracts/tokens/package.json | 4 |
2 files changed, 2 insertions, 22 deletions
diff --git a/contracts/tokens/.solhint.json b/contracts/tokens/.solhint.json deleted file mode 100644 index 076afe9f3..000000000 --- a/contracts/tokens/.solhint.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "default", - "rules": { - "avoid-low-level-calls": false, - "avoid-tx-origin": "warn", - "bracket-align": false, - "code-complexity": false, - "const-name-snakecase": "error", - "expression-indent": "error", - "function-max-lines": false, - "func-order": "error", - "indent": ["error", 4], - "max-line-length": ["warn", 160], - "no-inline-assembly": false, - "quotes": ["error", "double"], - "separate-by-one-line-in-contract": "error", - "space-after-comma": "error", - "statement-indent": "error" - } -} diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json index 07ff622f8..b741527b7 100644 --- a/contracts/tokens/package.json +++ b/contracts/tokens/package.json @@ -30,7 +30,7 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", - "lint-contracts": "solhint contracts/**/**/**/**/*.sol" + "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { "abis": "generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|DummyERC721Receiver|InvalidERC721Receiver|DummyERC721Token|ReentrantERC20Token|ERC20Token|IERC20Token|MintableERC20Token|UnlimitedAllowanceERC20Token|ERC721Token|IERC721Receiver|IERC721Token|MintableERC721Token|IEtherToken|WETH9|ERC20Token_v1|Token_v1|UnlimitedAllowanceToken_v1|ZRXToken).json" @@ -66,7 +66,7 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "solc": "^0.4.24", - "solhint": "^1.2.1", + "solhint": "^1.4.1", "tslint": "5.11.0", "typescript": "3.0.1", "yargs": "^10.0.3" |