diff options
| -rw-r--r-- | .prettierignore | 2 | ||||
| -rw-r--r-- | packages/abi-gen-wrappers/tsconfig.json | 4 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/forwarder_wrapper_test.ts | 2 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/revert_validation_test.ts | 2 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/utils/migrate.ts | 5 | ||||
| -rw-r--r-- | packages/order-watcher/test/utils/migrate.ts | 5 |
6 files changed, 16 insertions, 4 deletions
diff --git a/.prettierignore b/.prettierignore index 4faff88a3..2e452ad02 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,6 +2,8 @@ lib .nyc_output /packages/contracts/generated-wrappers /packages/contracts/generated-artifacts +/packages/abi-gen-wrappers/wrappers +/packages/contract-artifacts/artifacts /packages/metacoin/src/contract_wrappers /packages/0x.js/src/generated_contract_wrappers/ /packages/fill-scenarios/src/generated_contract_wrappers/ 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, |