aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/protocol
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-12-11 07:20:52 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-12-11 07:24:11 +0800
commit5e6d1779cb51fc1687c46f687a2140e05b0a6559 (patch)
treed9c60ff019ffaad7e1be4d37e374b7fa8ea51396 /contracts/protocol
parentc580f4ddcb61844e590e0829c32cbdd15ab03beb (diff)
downloaddexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.tar
dexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.tar.gz
dexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.tar.bz2
dexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.tar.lz
dexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.tar.xz
dexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.tar.zst
dexon-sol-tools-5e6d1779cb51fc1687c46f687a2140e05b0a6559.zip
Re-use solhint configuration
Diffstat (limited to 'contracts/protocol')
-rw-r--r--contracts/protocol/.solhint.json20
-rw-r--r--contracts/protocol/package.json4
2 files changed, 2 insertions, 22 deletions
diff --git a/contracts/protocol/.solhint.json b/contracts/protocol/.solhint.json
deleted file mode 100644
index 076afe9f3..000000000
--- a/contracts/protocol/.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/protocol/package.json b/contracts/protocol/package.json
index 6ed2f34e9..ed1953f21 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/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/@(AssetProxyOwner|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyOwner|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver).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"