aboutsummaryrefslogtreecommitdiffstats
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
parent07a0170f34e220372bfca6423e5b2f98757addac (diff)
downloaddexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar
dexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.gz
dexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.bz2
dexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.lz
dexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.xz
dexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.tar.zst
dexon-0x-contracts-8afac3a92c8da3b8f54bf01e7d7e95cc36ef1e77.zip
Re-use solhint configuration
-rw-r--r--contracts/.solhint.json (renamed from contracts/examples/.solhint.json)0
-rw-r--r--contracts/examples/package.json4
-rw-r--r--contracts/extensions/.solhint.json20
-rw-r--r--contracts/extensions/package.json4
-rw-r--r--contracts/interfaces/.solhint.json20
-rw-r--r--contracts/interfaces/package.json4
-rw-r--r--contracts/libs/.solhint.json20
-rw-r--r--contracts/libs/package.json4
-rw-r--r--contracts/multisig/.solhint.json20
-rw-r--r--contracts/multisig/package.json4
-rw-r--r--contracts/protocol/.solhint.json20
-rw-r--r--contracts/protocol/package.json4
-rw-r--r--contracts/tokens/.solhint.json20
-rw-r--r--contracts/tokens/package.json4
-rw-r--r--contracts/utils/.solhint.json20
-rw-r--r--contracts/utils/package.json4
16 files changed, 16 insertions, 156 deletions
diff --git a/contracts/examples/.solhint.json b/contracts/.solhint.json
index 076afe9f3..076afe9f3 100644
--- a/contracts/examples/.solhint.json
+++ b/contracts/.solhint.json
diff --git a/contracts/examples/package.json b/contracts/examples/package.json
index c18f1ae79..083b47457 100644
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -18,7 +18,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/@(ExchangeWrapper|Validator|Wallet|Whitelist).json"
@@ -54,7 +54,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"
diff --git a/contracts/extensions/.solhint.json b/contracts/extensions/.solhint.json
deleted file mode 100644
index 076afe9f3..000000000
--- a/contracts/extensions/.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/extensions/package.json b/contracts/extensions/package.json
index 07163f78a..9d60317a0 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/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/@(DutchAuction|Forwarder|OrderValidator).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"
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 6461e9779..9ba41192c 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"
diff --git a/contracts/libs/.solhint.json b/contracts/libs/.solhint.json
deleted file mode 100644
index 076afe9f3..000000000
--- a/contracts/libs/.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/libs/package.json b/contracts/libs/package.json
index c25730fd2..a01b51b42 100644
--- a/contracts/libs/package.json
+++ b/contracts/libs/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/@(LibMath|LibOrder|LibFillResults|LibAbiEncoder|TestLibs|LibEIP712).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"
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"
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"
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"
diff --git a/contracts/utils/.solhint.json b/contracts/utils/.solhint.json
deleted file mode 100644
index 076afe9f3..000000000
--- a/contracts/utils/.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/utils/package.json b/contracts/utils/package.json
index 6163b1ae7..27b29eaad 100644
--- a/contracts/utils/package.json
+++ b/contracts/utils/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/@(IOwnable|Ownable|LibBytes|ReentrancyGuard|SafeMath|TestConstants|TestLibBytes).json"
@@ -67,7 +67,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"