3 files changed, 60 insertions, 33 deletions
diff --git a/packages/contract-wrappers/test/utils/constants.ts b/packages/contract-wrappers/test/utils/constants.ts
index cf030259c..60c3370a2 100644
--- a/packages/contract-wrappers/test/utils/constants.ts
+++ b/packages/contract-wrappers/test/utils/constants.ts
@@ -1,9 +1,18 @@
+import { BigNumber } from '@0xproject/utils';
+
 export const constants = {
     NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
     ROPSTEN_NETWORK_ID: 3,
     KOVAN_NETWORK_ID: 42,
     TESTRPC_NETWORK_ID: 50,
+    AWAIT_TRANSACTION_MINED_MS: 0,
     KOVAN_RPC_URL: 'https://kovan.infura.io/',
     ROPSTEN_RPC_URL: 'https://ropsten.infura.io/',
     ZRX_DECIMALS: 18,
+    DUMMY_TOKEN_NAME: '',
+    DUMMY_TOKEN_SYMBOL: '',
+    DUMMY_TOKEN_DECIMALS: 18,
+    DUMMY_TOKEN_TOTAL_SUPPLY: new BigNumber(10 ** 27), // tslint:disable-line:custom-no-magic-numbers
+    NUM_DUMMY_ERC20_TO_DEPLOY: 3,
+    NUM_DUMMY_ERC721_TO_DEPLOY: 1,
 };
diff --git a/packages/contract-wrappers/test/utils/token_utils.ts b/packages/contract-wrappers/test/utils/token_utils.ts
index fe85de085..3ef83546b 100644
--- a/packages/contract-wrappers/test/utils/token_utils.ts
+++ b/packages/contract-wrappers/test/utils/token_utils.ts
@@ -1,33 +1,47 @@
-import * as _ from 'lodash';
+import { generatePseudoRandomSalt } from '@0xproject/order-utils';
+import { BigNumber } from '@0xproject/utils';
 
-import { InternalContractWrappersError, Token } from '../../src/types';
+import { artifacts } from '../../src/artifacts';
+import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_erc721_token';
 
-const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
-const WETH_TOKEN_SYMBOL = 'WETH';
+import { constants } from './constants';
+import { provider, txDefaults, web3Wrapper } from './web3_wrapper';
 
-export class TokenUtils {
-    private _tokens: Token[];
-    constructor(tokens: Token[]) {
-        this._tokens = tokens;
-    }
-    public getProtocolTokenOrThrow(): Token {
-        const zrxToken = _.find(this._tokens, { symbol: PROTOCOL_TOKEN_SYMBOL });
-        if (_.isUndefined(zrxToken)) {
-            throw new Error(InternalContractWrappersError.ZrxNotInTokenRegistry);
-        }
-        return zrxToken;
-    }
-    public getWethTokenOrThrow(): Token {
-        const wethToken = _.find(this._tokens, { symbol: WETH_TOKEN_SYMBOL });
-        if (_.isUndefined(wethToken)) {
-            throw new Error(InternalContractWrappersError.WethNotInTokenRegistry);
-        }
-        return wethToken;
-    }
-    public getDummyTokens(): Token[] {
-        const dummyTokens = _.filter(this._tokens, token => {
-            return !_.includes([PROTOCOL_TOKEN_SYMBOL, WETH_TOKEN_SYMBOL], token.symbol);
-        });
-        return dummyTokens;
-    }
-}
+// Those addresses come from migrations. They're deterministic so it's relatively safe to hard-code them here.
+// Before we were fetching them from the TokenRegistry but now we can't as it's deprecated and removed.
+const DUMMY_ERC_20_ADRESSES = [
+    '0x07f96aa816c1f244cbc6ef114bb2b023ba54a2eb',
+    '0x6a4a62e5a7ed13c361b176a5f62c2ee620ac0df8',
+    '0x6dfff22588be9b3ef8cf0ad6dc9b84796f9fb45f',
+    '0xcfc18cec799fbd1793b5c43e773c98d4d61cc2db',
+    '0xf22469f31527adc53284441bae1665a7b9214dba',
+];
+
+const DUMMY_ERC_721_ADRESSES = ['0x10add991de718a69dec2117cb6aa28098836511b'];
+
+export const tokenUtils = {
+    getProtocolTokenAddress(): string {
+        return artifacts.ZRXToken.networks[constants.TESTRPC_NETWORK_ID].address;
+    },
+    getWethTokenAddress(): string {
+        return artifacts.EtherToken.networks[constants.TESTRPC_NETWORK_ID].address;
+    },
+    getDummyERC20TokenAddresses(): string[] {
+        return DUMMY_ERC_20_ADRESSES;
+    },
+    getDummyERC721TokenAddresses(): string[] {
+        return DUMMY_ERC_721_ADRESSES;
+    },
+    async mintDummyERC721Async(address: string, tokenOwner: string): Promise<BigNumber> {
+        const erc721 = new DummyERC721TokenContract(
+            artifacts.DummyERC721Token.compilerOutput.abi,
+            address,
+            provider,
+            txDefaults,
+        );
+        const tokenId = generatePseudoRandomSalt();
+        const txHash = await erc721.mint.sendTransactionAsync(tokenOwner, tokenId);
+        web3Wrapper.awaitTransactionSuccessAsync(txHash);
+        return tokenId;
+    },
+};
diff --git a/packages/contract-wrappers/test/utils/web3_wrapper.ts b/packages/contract-wrappers/test/utils/web3_wrapper.ts
index f7d11f138..641444539 100644
--- a/packages/contract-wrappers/test/utils/web3_wrapper.ts
+++ b/packages/contract-wrappers/test/utils/web3_wrapper.ts
@@ -1,8 +1,12 @@
-import { web3Factory } from '@0xproject/dev-utils';
-import { Provider } from '@0xproject/types';
+import { devConstants, web3Factory } from '@0xproject/dev-utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Provider } from 'ethereum-types';
 
+const txDefaults = {
+    from: devConstants.TESTRPC_FIRST_ADDRESS,
+    gasLimit: devConstants.GAS_LIMIT,
+};
 const provider: Provider = web3Factory.getRpcProvider({ shouldUseInProcessGanache: true });
 const web3Wrapper = new Web3Wrapper(provider);
 
-export { provider, web3Wrapper };
+export { provider, web3Wrapper, txDefaults };