aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-12-16 01:26:45 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-12-16 01:44:13 +0800
commitc8e52882ca556ea06696a56e312f69284f99aa29 (patch)
tree38a2de1b15985590b879f71fc17cbee35a17ba78
parent818a50a3fb0b78992919e0366c73b36cbffa69b0 (diff)
downloaddexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.tar
dexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.tar.gz
dexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.tar.bz2
dexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.tar.lz
dexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.tar.xz
dexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.tar.zst
dexon-sol-tools-c8e52882ca556ea06696a56e312f69284f99aa29.zip
Fix redundant spaces
-rw-r--r--packages/0x.js/test/remaining_fillable_calculator_test.ts10
-rw-r--r--packages/0x.js/test/utils/report_callback_errors.ts2
-rw-r--r--packages/assert/test/assert_test.ts30
-rw-r--r--packages/subproviders/test/utils/report_callback_errors.ts2
-rw-r--r--packages/tslint-config/package.json7
-rw-r--r--packages/tslint-config/tslint.json4
-rw-r--r--packages/website/ts/components/token_balances.tsx2
-rw-r--r--packages/website/ts/components/top_bar.tsx2
-rw-r--r--yarn.lock27
9 files changed, 58 insertions, 28 deletions
diff --git a/packages/0x.js/test/remaining_fillable_calculator_test.ts b/packages/0x.js/test/remaining_fillable_calculator_test.ts
index 47ba13cd7..95ef0a4f1 100644
--- a/packages/0x.js/test/remaining_fillable_calculator_test.ts
+++ b/packages/0x.js/test/remaining_fillable_calculator_test.ts
@@ -2,11 +2,11 @@ import BigNumber from 'bignumber.js';
import * as chai from 'chai';
import 'mocha';
-import { ZeroEx } from '../src/0x';
-import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator';
-import { ECSignature, SignedOrder } from '../src/types';
+import {ZeroEx} from '../src/0x';
+import {RemainingFillableCalculator} from '../src/order_watcher/remaining_fillable_calculator';
+import {ECSignature, SignedOrder} from '../src/types';
-import { chaiSetup } from './utils/chai_setup';
+import {chaiSetup} from './utils/chai_setup';
chaiSetup.configure();
const expect = chai.expect;
@@ -26,7 +26,7 @@ describe('RemainingFillableCalculator', () => {
const decimals: number = 4;
const zero: BigNumber = new BigNumber(0);
const zeroAddress = '0x0';
- const signature: ECSignature = { v: 27, r: '', s: ''};
+ const signature: ECSignature = {v: 27, r: '', s: ''};
beforeEach(async () => {
[makerAmount, takerAmount, makerFeeAmount] = [ZeroEx.toBaseUnitAmount(new BigNumber(50), decimals),
ZeroEx.toBaseUnitAmount(new BigNumber(5), decimals),
diff --git a/packages/0x.js/test/utils/report_callback_errors.ts b/packages/0x.js/test/utils/report_callback_errors.ts
index 8a8f4d966..0aaef3f05 100644
--- a/packages/0x.js/test/utils/report_callback_errors.ts
+++ b/packages/0x.js/test/utils/report_callback_errors.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '../../src/types';
+import {DoneCallback} from '../../src/types';
export const reportCallbackErrors = (done: DoneCallback) => {
return (f: (...args: any[]) => void) => {
diff --git a/packages/assert/test/assert_test.ts b/packages/assert/test/assert_test.ts
index 5fa96e49a..6a9efc748 100644
--- a/packages/assert/test/assert_test.ts
+++ b/packages/assert/test/assert_test.ts
@@ -25,7 +25,7 @@ describe('Assertions', () => {
'test',
42,
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
];
invalidInputs.forEach(input => expect(assert.isBigNumber.bind(assert, variableName, input)).to.throw());
@@ -43,7 +43,7 @@ describe('Assertions', () => {
'test',
42,
false,
- { random: 'test' },
+ {random: 'test'},
];
invalidInputs.forEach(input => expect(assert.isUndefined.bind(assert, input, variableName)).to.throw());
});
@@ -60,7 +60,7 @@ describe('Assertions', () => {
const invalidInputs = [
42,
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -79,7 +79,7 @@ describe('Assertions', () => {
const invalidInputs = [
42,
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -98,7 +98,7 @@ describe('Assertions', () => {
const invalidInputs = [
42,
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
'0x61a3ed31B43c8780e905a260a35faYfEc527be7516aa11c0256729b5b351bc33',
@@ -121,7 +121,7 @@ describe('Assertions', () => {
const invalidInputs = [
42,
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
'0x6FFFd0ae3f7d88c9b4925323f54c6e4b2918c5fd',
@@ -150,7 +150,7 @@ describe('Assertions', () => {
const invalidInputs = [
42,
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -192,7 +192,7 @@ describe('Assertions', () => {
it('should throw for invalid input', () => {
const invalidInputs = [
false,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -210,7 +210,7 @@ describe('Assertions', () => {
it('should throw for invalid input', () => {
const invalidInputs = [
42,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -220,8 +220,8 @@ describe('Assertions', () => {
describe('#isWeb3Provider', () => {
it('should not throw for valid input', () => {
const validInputs = [
- { send: () => 45 },
- { sendAsync: () => 45 },
+ {send: () => 45},
+ {sendAsync: () => 45},
];
validInputs.forEach(input =>
expect(assert.isWeb3Provider.bind(assert, variableName, input)).to.not.throw(),
@@ -230,7 +230,7 @@ describe('Assertions', () => {
it('should throw for invalid input', () => {
const invalidInputs = [
42,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -253,7 +253,7 @@ describe('Assertions', () => {
it('should throw for invalid input', () => {
const invalidInputs = [
42,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
];
@@ -277,7 +277,7 @@ describe('Assertions', () => {
it('should throw for invalid input', () => {
const invalidInputs = [
42,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
'ws://www.api.example-relayer.net',
@@ -309,7 +309,7 @@ describe('Assertions', () => {
it('should throw for invalid input', () => {
const invalidInputs = [
42,
- { random: 'test' },
+ {random: 'test'},
undefined,
new BigNumber(45),
'www.google.com',
diff --git a/packages/subproviders/test/utils/report_callback_errors.ts b/packages/subproviders/test/utils/report_callback_errors.ts
index 8a8f4d966..0aaef3f05 100644
--- a/packages/subproviders/test/utils/report_callback_errors.ts
+++ b/packages/subproviders/test/utils/report_callback_errors.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '../../src/types';
+import {DoneCallback} from '../../src/types';
export const reportCallbackErrors = (done: DoneCallback) => {
return (f: (...args: any[]) => void) => {
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 3b320e774..888ff675a 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -4,9 +4,9 @@
"description": "Lint rules related to 0xProject for TSLint",
"main": "tslint.json",
"scripts": {
- "build": "tsc",
- "clean": "shx rm -rf lib",
- "lint": "tslint --project . 'rules/**/*.ts'"
+ "build": "tsc",
+ "clean": "shx rm -rf lib",
+ "lint": "tslint --project . 'rules/**/*.ts'"
},
"files": [
"tslint.js",
@@ -37,6 +37,7 @@
"@types/lodash": "^4.14.86",
"shx": "^0.2.2",
"tslint": "5.8.0",
+ "tslint-eslint-rules": "^4.1.1",
"typescript": "~2.6.1"
},
"dependencies": {
diff --git a/packages/tslint-config/tslint.json b/packages/tslint-config/tslint.json
index 91185bddb..acb6876c3 100644
--- a/packages/tslint-config/tslint.json
+++ b/packages/tslint-config/tslint.json
@@ -1,7 +1,8 @@
{
"extends": [
"tslint:latest",
- "tslint-react"
+ "tslint-react",
+ "tslint-eslint-rules"
],
"rules": {
"adjacent-overload-signatures": true,
@@ -54,6 +55,7 @@
"no-unused-variable": [true, {"ignore-pattern": "^_\\d*"}],
"no-implicit-dependencies": [true, "dev"],
"number-literal-format": true,
+ "object-curly-spacing": [true, "never"],
"object-literal-sort-keys": false,
"ordered-imports": [
true,
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 478114516..b68081c37 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -576,7 +576,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
private renderDharmaLoanFrame() {
if (utils.isUserOnMobile()) {
return (
- <h4 style={{ textAlign: 'center' }}>
+ <h4 style={{textAlign: 'center'}}>
We apologize -- Dharma loan requests are not available on
mobile yet. Please try again through your desktop browser.
</h4>
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 488eef914..27de49620 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -124,7 +124,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
className="text-decoration-none"
href={constants.GITHUB_URL}
>
- <MenuItem style={{ fontSize: styles.menuItem.fontSize }} primaryText="GitHub" />
+ <MenuItem style={{fontSize: styles.menuItem.fontSize}} primaryText="GitHub" />
</a>,
<a
key="subMenuItem-whitePaper"
diff --git a/yarn.lock b/yarn.lock
index 5c084bace..2a7e12949 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2753,6 +2753,13 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"
+doctrine@^0.7.2:
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+ dependencies:
+ esutils "^1.1.6"
+ isarray "0.0.1"
+
dom-helpers@^3.2.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
@@ -3017,6 +3024,10 @@ estraverse@^4.1.0, estraverse@^4.1.1:
version "4.2.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+esutils@^1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+
esutils@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -8908,6 +8919,10 @@ truffle@^4.0.1:
original-require "^1.0.1"
solc "0.4.18"
+tslib@^1.0.0:
+ version "1.8.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
+
tslib@^1.7.1:
version "1.8.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6"
@@ -8918,6 +8933,14 @@ tslint-config-0xproject@^0.0.2:
dependencies:
tslint-react "^3.0.0"
+tslint-eslint-rules@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
+ dependencies:
+ doctrine "^0.7.2"
+ tslib "^1.0.0"
+ tsutils "^1.4.0"
+
tslint-react@^3.0.0, tslint-react@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.2.0.tgz#851fb505201c63d0343c51726e6364f7e9ad2e99"
@@ -8940,6 +8963,10 @@ tslint@5.8.0:
tslib "^1.7.1"
tsutils "^2.12.1"
+tsutils@^1.4.0:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
+
tsutils@^2.12.1, tsutils@^2.8.0:
version "2.12.2"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.2.tgz#ad58a4865d17ec3ddb6631b6ca53be14a5656ff3"