aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-10-10 05:17:40 +0800
committerAlex Browne <stephenalexbrowne@gmail.com>2018-10-16 04:37:57 +0800
commit1b8b2c0b9b998f42ded72f56c799a7951ed5239f (patch)
tree7c90b402b6d6f737a514b6809673fb6cdf8a2fec /packages
parent6c8fb370dc562b128fc24a19e3f7bbf8b5381425 (diff)
downloaddexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.tar
dexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.tar.gz
dexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.tar.bz2
dexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.tar.lz
dexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.tar.xz
dexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.tar.zst
dexon-sol-tools-1b8b2c0b9b998f42ded72f56c799a7951ed5239f.zip
Appease linter
Diffstat (limited to 'packages')
-rw-r--r--packages/abi-gen-wrappers/tsconfig.json4
-rw-r--r--packages/contract-wrappers/test/forwarder_wrapper_test.ts2
-rw-r--r--packages/contract-wrappers/test/revert_validation_test.ts2
-rw-r--r--packages/contract-wrappers/test/utils/migrate.ts5
-rw-r--r--packages/order-watcher/test/utils/migrate.ts5
5 files changed, 14 insertions, 4 deletions
diff --git a/packages/abi-gen-wrappers/tsconfig.json b/packages/abi-gen-wrappers/tsconfig.json
index 241a4ae51..5c376136e 100644
--- a/packages/abi-gen-wrappers/tsconfig.json
+++ b/packages/abi-gen-wrappers/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../tsconfig",
"compilerOptions": {
"outDir": "lib",
- "rootDir": ".",
+ "rootDir": "."
},
- "include": ["./src/**/*", "./wrappers/**/*"],
+ "include": ["./src/**/*", "./wrappers/**/*"]
}
diff --git a/packages/contract-wrappers/test/forwarder_wrapper_test.ts b/packages/contract-wrappers/test/forwarder_wrapper_test.ts
index 9fe39ea9f..730658884 100644
--- a/packages/contract-wrappers/test/forwarder_wrapper_test.ts
+++ b/packages/contract-wrappers/test/forwarder_wrapper_test.ts
@@ -54,7 +54,7 @@ describe('ForwarderWrapper', () => {
contractWrappers.erc20Proxy.address,
contractWrappers.erc721Proxy.address,
);
- [, makerAddress, takerAddress ] = userAddresses;
+ [, makerAddress, takerAddress] = userAddresses;
[makerTokenAddress] = tokenUtils.getDummyERC20TokenAddresses();
takerTokenAddress = contractWrappers.forwarder.etherTokenAddress;
[makerAssetData, takerAssetData] = [
diff --git a/packages/contract-wrappers/test/revert_validation_test.ts b/packages/contract-wrappers/test/revert_validation_test.ts
index 1d0baf1e3..c5673bb61 100644
--- a/packages/contract-wrappers/test/revert_validation_test.ts
+++ b/packages/contract-wrappers/test/revert_validation_test.ts
@@ -109,7 +109,7 @@ describe('Revert Validation ExchangeWrapper', () => {
makerTokenBalance,
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
- await expect(
+ return expect(
contractWrappers.exchange.fillOrderAsync(signedOrder, takerTokenFillAmount, takerAddress, {
shouldValidate: true,
}),
diff --git a/packages/contract-wrappers/test/utils/migrate.ts b/packages/contract-wrappers/test/utils/migrate.ts
index adcc22b1a..26412d246 100644
--- a/packages/contract-wrappers/test/utils/migrate.ts
+++ b/packages/contract-wrappers/test/utils/migrate.ts
@@ -4,6 +4,11 @@ import { ContractAddresses } from '@0xproject/types';
import { provider } from './web3_wrapper';
+/**
+ * Configures and runs the migrations exactly once. Any subsequent times this is
+ * called, it returns the cached addresses.
+ * @returns The addresses of contracts that were deployed during the migrations.
+ */
export async function migrateOnceAsync(): Promise<ContractAddresses> {
const txDefaults = {
gas: devConstants.GAS_LIMIT,
diff --git a/packages/order-watcher/test/utils/migrate.ts b/packages/order-watcher/test/utils/migrate.ts
index adcc22b1a..26412d246 100644
--- a/packages/order-watcher/test/utils/migrate.ts
+++ b/packages/order-watcher/test/utils/migrate.ts
@@ -4,6 +4,11 @@ import { ContractAddresses } from '@0xproject/types';
import { provider } from './web3_wrapper';
+/**
+ * Configures and runs the migrations exactly once. Any subsequent times this is
+ * called, it returns the cached addresses.
+ * @returns The addresses of contracts that were deployed during the migrations.
+ */
export async function migrateOnceAsync(): Promise<ContractAddresses> {
const txDefaults = {
gas: devConstants.GAS_LIMIT,