aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-12 01:43:40 +0800
committerFabio Berger <me@fabioberger.com>2018-06-12 01:43:40 +0800
commit89b7b56a2cb38d95f65067e5493e8135cb1e7e98 (patch)
tree5edf371ba080d4ca747ecda2f4c0695fff95a618
parentae54b13d4b36ff2b95a3df211bf53948def3f855 (diff)
downloaddexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.tar
dexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.tar.gz
dexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.tar.bz2
dexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.tar.lz
dexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.tar.xz
dexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.tar.zst
dexon-sol-tools-89b7b56a2cb38d95f65067e5493e8135cb1e7e98.zip
Fix tslint issues
-rw-r--r--packages/order-utils/package.json4
-rw-r--r--packages/order-utils/src/exchange_transfer_simulator.ts1
-rw-r--r--packages/order-utils/src/order_validation_utils.ts2
-rw-r--r--packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts1
-rw-r--r--packages/order-utils/test/exchange_transfer_simulator_test.ts5
5 files changed, 5 insertions, 8 deletions
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index e19827779..8f37bb138 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -13,7 +13,7 @@
"pre_build": "run-s update_artifacts generate_contract_wrappers",
"transpile": "tsc",
"copy_monorepo_scripts": "copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
- "generate_contract_wrappers": "abi-gen --abis 'lib/src/artifacts/@(Exchange|IWallet|IValidator|DummyERC20Token|ERC20Proxy).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
+ "generate_contract_wrappers": "abi-gen --abis 'lib/src/artifacts/@(Exchange|IWallet|IValidator|DummyERC20Token|ERC20Proxy|ERC20Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
"update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json lib/src/artifacts; done;",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
@@ -29,7 +29,7 @@
"upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
},
"config": {
- "contracts": "IWallet IValidator Exchange DummyERC20Token ERC20Proxy",
+ "contracts": "IWallet IValidator Exchange DummyERC20Token ERC20Proxy ERC20Token",
"postpublish": {
"docPublishConfigs": {
"extraFileIncludes": [
diff --git a/packages/order-utils/src/exchange_transfer_simulator.ts b/packages/order-utils/src/exchange_transfer_simulator.ts
index 1cb132aba..32d53d6a2 100644
--- a/packages/order-utils/src/exchange_transfer_simulator.ts
+++ b/packages/order-utils/src/exchange_transfer_simulator.ts
@@ -1,6 +1,5 @@
import { ExchangeContractErrs } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
-import { BlockParamLiteral } from 'ethereum-types';
import { AbstractBalanceAndProxyAllowanceLazyStore } from './abstract/abstract_balance_and_proxy_allowance_lazy_store';
import { constants } from './constants';
diff --git a/packages/order-utils/src/order_validation_utils.ts b/packages/order-utils/src/order_validation_utils.ts
index 4280e4d97..aebb6db70 100644
--- a/packages/order-utils/src/order_validation_utils.ts
+++ b/packages/order-utils/src/order_validation_utils.ts
@@ -192,7 +192,7 @@ export class OrderValidationUtils {
zrxTokenAddress,
);
- const wouldRoundingErrorOccur = await OrderValidationUtils.isRoundingError(
+ const wouldRoundingErrorOccur = OrderValidationUtils.isRoundingError(
filledTakerTokenAmount,
signedOrder.takerAssetAmount,
signedOrder.makerAssetAmount,
diff --git a/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts b/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
index b5bd2801a..08d50b924 100644
--- a/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
+++ b/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
@@ -1,5 +1,4 @@
import { BigNumber } from '@0xproject/utils';
-import { BlockParamLiteral } from 'ethereum-types';
import * as _ from 'lodash';
import { AbstractBalanceAndProxyAllowanceFetcher } from '../abstract/abstract_balance_and_proxy_allowance_fetcher';
diff --git a/packages/order-utils/test/exchange_transfer_simulator_test.ts b/packages/order-utils/test/exchange_transfer_simulator_test.ts
index 3e35f900e..13e2dcc62 100644
--- a/packages/order-utils/test/exchange_transfer_simulator_test.ts
+++ b/packages/order-utils/test/exchange_transfer_simulator_test.ts
@@ -1,8 +1,7 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { ExchangeContractErrs, Token } from '@0xproject/types';
+import { ExchangeContractErrs } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
-import { BlockParamLiteral } from 'ethereum-types';
import * as _ from 'lodash';
import 'make-promises-safe';
@@ -96,7 +95,7 @@ describe('ExchangeTransferSimulator', async () => {
),
).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerBalance);
});
- it('updates balances and proxyAllowance after transfer', async function(): Promise<void> {
+ it('updates balances and proxyAllowance after transfer', async () => {
txHash = await dummyERC20Token.transfer.sendTransactionAsync(sender, transferAmount, {
from: coinbase,
});