Skip to content

Commit

Permalink
Add EditorConfig (#1119)
Browse files Browse the repository at this point in the history
* Add EditorConfig file.

This allows users with a wide variety of editors to easily code in
OpenZeppelin's preferred 2 space indentation code style.

See https://editorconfig.org for more information.

* Eslint: Always disallow trailing space

* Eslint: Error on missing EOL at file end
  • Loading branch information
justuswilhelm authored and nventuro committed Jul 27, 2018
1 parent f5b0bb3 commit ae2980b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
4 changes: 2 additions & 2 deletions .eslintrc
Expand Up @@ -28,7 +28,7 @@
"comma-dangle": ["warn", "always-multiline"],
"comma-spacing": ["error", {"before": false, "after": true}],
"dot-notation": ["error", {"allowKeywords": true, "allowPattern": ""}],
"eol-last": "warn",
"eol-last": ["error", "always"],
"eqeqeq": ["error", "smart"],
"generator-star-spacing": ["error", "before"],
"indent": ["error", 2],
Expand All @@ -38,7 +38,7 @@
"no-dupe-keys": "error",
"no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
"no-redeclare": ["error", {"builtinGlobals": true}],
"no-trailing-spaces": ["error", { "skipBlankLines": true }],
"no-trailing-spaces": ["error", { "skipBlankLines": false }],
"no-undef": "error",
"no-use-before-define": "off",
"no-var": "error",
Expand Down
2 changes: 1 addition & 1 deletion test/Bounty.test.js
Expand Up @@ -25,7 +25,7 @@ contract('Bounty', function ([_, owner, researcher]) {

it('can set reward', async function () {
await sendReward(owner, this.bounty.address, reward);

const balance = await ethGetBalance(this.bounty.address);
balance.should.be.bignumber.eq(reward);
});
Expand Down

0 comments on commit ae2980b

Please sign in to comment.