Skip to content

Commit

Permalink
prettier added
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Furter committed Oct 22, 2018
1 parent a7e3cf0 commit 4ee5145
Show file tree
Hide file tree
Showing 222 changed files with 1,698 additions and 2,336 deletions.
2 changes: 0 additions & 2 deletions .jshintignore

This file was deleted.

19 changes: 0 additions & 19 deletions .jshintrc

This file was deleted.

5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules
dist
_build
build
coverage
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"printWidth": 120,
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": true,
"trailingComma": "none",
"bracketSpacing": false,
"arrowParens": "always",
"proseWrap": "never"
}
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build": "webpack --mode production",
"release": "lerna bootstrap; lerna publish; gulp version; gulp; gulp publishTag; git push --tags",
"docs": "cd docs; make html;",
"lint": "jshint *.js packages"
"format": "prettier --config ./.prettierrc --write ./packages/**/*.js"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -75,14 +75,13 @@
"babel-preset-env": "^1.6.0",
"bn.js": "4.11.8",
"coveralls": "^3.0.2",
"crypto-js": "^3.1.4",
"duplicate-package-checker-webpack-plugin": "^3.0.0",
"eth-lib": "^0.2.8",
"ethereumjs-wallet": "^0.6.2",
"ethjs-signer": "^0.1.1",
"js-sha3": "^0.8.0",
"jshint": ">=2.5.0",
"lerna": "^2.5.1",
"prettier": "1.14.3",
"uglifyjs-webpack-plugin": "^2.0.1",
"underscore": "^1.8.3",
"webpack": "^4.21.0",
Expand Down
1 change: 0 additions & 1 deletion packages/web3-bzz/src/Bzz.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {isObject, isString} from 'underscore';
import swarm from 'swarm-js';

export default class Bzz {

/**
* @param {Object|String} provider
*
Expand Down
8 changes: 6 additions & 2 deletions packages/web3-core-helpers/src/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

export default {
ErrorResponse(result) {
const message = !!result && !!result.error && !!result.error.message ? result.error.message : JSON.stringify(result);
const message =
!!result && !!result.error && !!result.error.message ? result.error.message : JSON.stringify(result);
return new Error(`Returned error: ${message}`);
},
InvalidNumberOfParams(got, expected, method) {
Expand All @@ -36,7 +37,10 @@ export default {
return new Error('Provider not set or invalid');
},
InvalidResponse(result) {
const message = !!result && !!result.error && !!result.error.message ? result.error.message : `Invalid JSON RPC response: ${JSON.stringify(result)}`;
const message =
!!result && !!result.error && !!result.error.message
? result.error.message
: `Invalid JSON RPC response: ${JSON.stringify(result)}`;
return new Error(message);
},
ConnectionTimeout(ms) {
Expand Down
Loading

0 comments on commit 4ee5145

Please sign in to comment.