diff options
Diffstat (limited to 'contracts/interfaces')
-rw-r--r-- | contracts/interfaces/.solhint.json | 20 | ||||
-rw-r--r-- | contracts/interfaces/package.json | 4 |
2 files changed, 2 insertions, 22 deletions
diff --git a/contracts/interfaces/.solhint.json b/contracts/interfaces/.solhint.json deleted file mode 100644 index 076afe9f3..000000000 --- a/contracts/interfaces/.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/interfaces/package.json b/contracts/interfaces/package.json index b79ae20ff..04d307f5d 100644 --- a/contracts/interfaces/package.json +++ b/contracts/interfaces/package.json @@ -15,7 +15,7 @@ "clean": "shx rm -rf lib generated-artifacts generated-wrappers", "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers", "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts", - "lint-contracts": "solhint contracts/**/**/**/**/*.sol" + "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { "abis": "generated-artifacts/@(IAssetData|IAssetProxy|IAuthorizable|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions).json" @@ -35,7 +35,7 @@ "@0x/tslint-config": "^1.0.10", "npm-run-all": "^4.1.2", "shx": "^0.2.2", - "solhint": "^1.2.1", + "solhint": "^1.4.1", "tslint": "5.11.0", "typescript": "3.0.1", "yargs": "^10.0.3" |