diff options
author | Alex Browne <stephenalexbrowne@gmail.com> | 2018-10-10 04:57:02 +0800 |
---|---|---|
committer | Alex Browne <stephenalexbrowne@gmail.com> | 2018-10-16 04:37:57 +0800 |
commit | 6c8fb370dc562b128fc24a19e3f7bbf8b5381425 (patch) | |
tree | da516616c782d5c6e5f7c7df50927e69c51e9059 /packages/order-watcher/test | |
parent | a48e0a08bf4ea8a8fb0f08cfe5187a6291378afb (diff) | |
download | dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.tar dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.tar.gz dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.tar.bz2 dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.tar.lz dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.tar.xz dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.tar.zst dexon-0x-contracts-6c8fb370dc562b128fc24a19e3f7bbf8b5381425.zip |
Update order-watcher to use new migrations functions
Diffstat (limited to 'packages/order-watcher/test')
-rw-r--r-- | packages/order-watcher/test/expiration_watcher_test.ts | 4 | ||||
-rw-r--r-- | packages/order-watcher/test/global_hooks.ts | 12 | ||||
-rw-r--r-- | packages/order-watcher/test/order_watcher_test.ts | 4 | ||||
-rw-r--r-- | packages/order-watcher/test/utils/migrate.ts | 13 |
4 files changed, 18 insertions, 15 deletions
diff --git a/packages/order-watcher/test/expiration_watcher_test.ts b/packages/order-watcher/test/expiration_watcher_test.ts index 056e53988..17be625bc 100644 --- a/packages/order-watcher/test/expiration_watcher_test.ts +++ b/packages/order-watcher/test/expiration_watcher_test.ts @@ -1,7 +1,6 @@ import { tokenUtils } from '@0xproject/contract-wrappers/lib/test/utils/token_utils'; import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; import { FillScenarios } from '@0xproject/fill-scenarios'; -import { getContractAddresses } from '@0xproject/migrations'; import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; import { DoneCallback } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; @@ -14,6 +13,7 @@ import { ExpirationWatcher } from '../src/order_watcher/expiration_watcher'; import { utils } from '../src/utils/utils'; import { chaiSetup } from './utils/chai_setup'; +import { migrateOnceAsync } from './utils/migrate'; import { provider, web3Wrapper } from './utils/web3_wrapper'; chaiSetup.configure(); @@ -35,8 +35,8 @@ describe('ExpirationWatcher', () => { let timer: Sinon.SinonFakeTimers; let expirationWatcher: ExpirationWatcher; before(async () => { + const contractAddresses = await migrateOnceAsync(); await blockchainLifecycle.startAsync(); - const contractAddresses = getContractAddresses(); userAddresses = await web3Wrapper.getAvailableAddressesAsync(); fillScenarios = new FillScenarios( provider, diff --git a/packages/order-watcher/test/global_hooks.ts b/packages/order-watcher/test/global_hooks.ts index 49340f9e1..26c37158f 100644 --- a/packages/order-watcher/test/global_hooks.ts +++ b/packages/order-watcher/test/global_hooks.ts @@ -1,16 +1,6 @@ -import { devConstants } from '@0xproject/dev-utils'; -import { runMigrationsAsync } from '@0xproject/migrations'; - -import { provider } from './utils/web3_wrapper'; - -before('migrate contracts', async function(): Promise<void> { +before('set up mocha', async function(): Promise<void> { // HACK: Since the migrations take longer then our global mocha timeout limit // we manually increase it for this before hook. const mochaTestTimeoutMs = 25000; this.timeout(mochaTestTimeoutMs); // tslint:disable-line:no-invalid-this - const txDefaults = { - gas: devConstants.GAS_LIMIT, - from: devConstants.TESTRPC_FIRST_ADDRESS, - }; - await runMigrationsAsync(provider, txDefaults); }); diff --git a/packages/order-watcher/test/order_watcher_test.ts b/packages/order-watcher/test/order_watcher_test.ts index 98a2fa089..e13d44396 100644 --- a/packages/order-watcher/test/order_watcher_test.ts +++ b/packages/order-watcher/test/order_watcher_test.ts @@ -3,7 +3,6 @@ import { ContractWrappers } from '@0xproject/contract-wrappers'; import { tokenUtils } from '@0xproject/contract-wrappers/lib/test/utils/token_utils'; import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; import { FillScenarios } from '@0xproject/fill-scenarios'; -import { getContractAddresses } from '@0xproject/migrations'; import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; import { DoneCallback, @@ -28,6 +27,7 @@ import { OrderWatcherError } from '../src/types'; import { chaiSetup } from './utils/chai_setup'; import { constants } from './utils/constants'; +import { migrateOnceAsync } from './utils/migrate'; import { provider, web3Wrapper } from './utils/web3_wrapper'; const TIMEOUT_MS = 150; @@ -54,9 +54,9 @@ describe('OrderWatcher', () => { const decimals = constants.ZRX_DECIMALS; const fillableAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(5), decimals); before(async () => { + const contractAddresses = await migrateOnceAsync(); await blockchainLifecycle.startAsync(); const networkId = constants.TESTRPC_NETWORK_ID; - const contractAddresses = getContractAddresses(); const config = { networkId, contractAddresses, diff --git a/packages/order-watcher/test/utils/migrate.ts b/packages/order-watcher/test/utils/migrate.ts new file mode 100644 index 000000000..adcc22b1a --- /dev/null +++ b/packages/order-watcher/test/utils/migrate.ts @@ -0,0 +1,13 @@ +import { devConstants } from '@0xproject/dev-utils'; +import { runMigrationsOnceAsync } from '@0xproject/migrations'; +import { ContractAddresses } from '@0xproject/types'; + +import { provider } from './web3_wrapper'; + +export async function migrateOnceAsync(): Promise<ContractAddresses> { + const txDefaults = { + gas: devConstants.GAS_LIMIT, + from: devConstants.TESTRPC_FIRST_ADDRESS, + }; + return runMigrationsOnceAsync(provider, txDefaults); +} |