aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/multisig
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-12-11 07:20:52 +0800
committerFred Carlsen <fred@sjelfull.no>2018-12-13 01:19:33 +0800
commit8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77 (patch)
tree57ef501ec0f54fe30647576cc0862630e044eb1e /contracts/multisig
parent07a0170f34e220372bfca6423e5b2f98757addac (diff)
downloaddexon-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/multisig')
-rw-r--r--contracts/multisig/.solhint.json20
-rw-r--r--contracts/multisig/package.json4
2 files changed, 2 insertions, 22 deletions
diff --git a/contracts/multisig/.solhint.json b/contracts/multisig/.solhint.json
deleted file mode 100644
index 076afe9f3..000000000
--- a/contracts/multisig/.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/multisig/package.json b/contracts/multisig/package.json
index e659d39ba..2114099f1 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -29,7 +29,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/@(MultiSigWallet|MultiSigWalletWithTimeLock|TestRejectEther).json"
@@ -65,7 +65,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"