aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-06-01 01:51:06 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-06-01 02:04:06 +0800
commitb8a267370d6538a6460625e283d7b1873066758a (patch)
treeb6e57c57063f40610027c3fcf895a3ecf6c760ab
parentfa3d011f68630e36b1a3812dd493a5144ebc6c53 (diff)
downloaddexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.tar
dexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.tar.gz
dexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.tar.bz2
dexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.tar.lz
dexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.tar.xz
dexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.tar.zst
dexon-sol-tools-b8a267370d6538a6460625e283d7b1873066758a.zip
Fix linter errors
-rw-r--r--packages/contract_templates/contract.handlebars2
-rw-r--r--packages/dev-utils/package.json1
-rw-r--r--packages/metacoin/package.json1
-rw-r--r--packages/metacoin/test/metacoin_test.ts2
-rw-r--r--packages/web3-wrapper/src/web3_wrapper.ts2
5 files changed, 5 insertions, 3 deletions
diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 2e04200d9..5fb19af11 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -2,7 +2,7 @@
* This file is auto-generated using abi-gen. Don't edit directly.
* Templates can be found at https://github.com/0xProject/0x-monorepo/tree/development/packages/contract_templates.
*/
-// tslint:disable:no-consecutive-blank-lines
+// tslint:disable:no-consecutive-blank-lines ordered-imports
// tslint:disable-next-line:no-unused-variable
import { BaseContract } from '@0xproject/base-contract';
import { ContractArtifact } from '@0xproject/sol-compiler';
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 5ba1484f3..47a13733b 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -45,6 +45,7 @@
},
"dependencies": {
"@0xproject/subproviders": "^0.10.2",
+ "@0xproject/types": "^0.7.0",
"ethereum-types": "^0.0.1",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/web3-wrapper": "^0.6.4",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 312aa0819..a85bf8f77 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -35,6 +35,7 @@
"@0xproject/types": "^0.7.0",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
+ "ethereum-types": "^0.0.1",
"ethers": "^3.0.15",
"lodash": "^4.17.4",
"web3-provider-engine": "^14.0.4"
diff --git a/packages/metacoin/test/metacoin_test.ts b/packages/metacoin/test/metacoin_test.ts
index c561f8b7f..3436fb49e 100644
--- a/packages/metacoin/test/metacoin_test.ts
+++ b/packages/metacoin/test/metacoin_test.ts
@@ -1,9 +1,9 @@
import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
import { ContractArtifact } from '@0xproject/sol-compiler';
-import { LogWithDecodedArgs } from 'ethereum-types';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
+import { LogWithDecodedArgs } from 'ethereum-types';
import 'make-promises-safe';
import * as MetacoinArtifact from '../artifacts/Metacoin.json';
diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts
index 32d03777c..3de152df1 100644
--- a/packages/web3-wrapper/src/web3_wrapper.ts
+++ b/packages/web3-wrapper/src/web3_wrapper.ts
@@ -1,3 +1,4 @@
+import { AbiDecoder, addressUtils, BigNumber, intervalUtils, promisify } from '@0xproject/utils';
import {
BlockParam,
BlockWithoutTransactionData,
@@ -13,7 +14,6 @@ import {
TransactionReceiptWithDecodedLogs,
TxData,
} from 'ethereum-types';
-import { AbiDecoder, addressUtils, BigNumber, intervalUtils, promisify } from '@0xproject/utils';
import * as _ from 'lodash';
import * as Web3 from 'web3';