diff options
Diffstat (limited to 'packages/contracts/test/exchange/helpers.ts')
| -rw-r--r-- | packages/contracts/test/exchange/helpers.ts | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts index 48ece0a7a..cac6e7872 100644 --- a/packages/contracts/test/exchange/helpers.ts +++ b/packages/contracts/test/exchange/helpers.ts @@ -5,12 +5,9 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import ethUtil = require('ethereumjs-util'); +import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; -import { - encodeERC20ProxyData, - encodeERC20V1ProxyData, - encodeERC721ProxyData, -} from '../../src/utils/asset_proxy_utils'; +import { encodeERC20ProxyData, encodeERC20V1ProxyData, encodeERC721ProxyData } from '../../src/utils/asset_proxy_utils'; import { constants } from '../../src/utils/constants'; import { ExchangeWrapper } from '../../src/utils/exchange_wrapper'; import { OrderFactory } from '../../src/utils/order_factory'; @@ -38,44 +35,36 @@ describe('Exchange', () => { [makerAddress, feeRecipientAddress] = accounts; const tokenRegistry = await deployer.deployAsync(ContractName.TokenRegistry); const tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy); - const assetProxyDispatcher = await deployer.deployAsync(ContractName.AssetProxyDispatcher); - const erc20TransferProxyV1 = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [ - tokenTransferProxy.address, - ]); - const erc20TransferProxy = await deployer.deployAsync(ContractName.ERC20Proxy); const [rep, dgd, zrx] = await Promise.all([ deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), ]); - const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [ - zrx.address, - AssetProxyId.ERC20, - assetProxyDispatcher.address, - ]); - const exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider); - await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] }); - await erc20TransferProxyV1.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, { - from: accounts[0], - }); + const assetProxyDispatcher = await deployer.deployAsync(ContractName.AssetProxyDispatcher); + // Deploy ERC20 Proxy + const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy); + const erc20TransferProxy = new ERC20ProxyContract( + erc20TransferProxyInstance.abi, + erc20TransferProxyInstance.address, + provider, + ); await erc20TransferProxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, { from: accounts[0], }); - await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(erc20TransferProxyV1.address, { - from: accounts[0], - }); - await assetProxyDispatcher.addAssetProxy.sendTransactionAsync( - AssetProxyId.ERC20_V1, - erc20TransferProxyV1.address, - ZeroEx.NULL_ADDRESS, - { from: accounts[0] }, - ); await assetProxyDispatcher.addAssetProxy.sendTransactionAsync( AssetProxyId.ERC20, erc20TransferProxy.address, ZeroEx.NULL_ADDRESS, { from: accounts[0] }, ); + // Deploy and configure Exchange + const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [ + zrx.address, + AssetProxyId.ERC20, + assetProxyDispatcher.address, + ]); + const exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider); + await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] }); const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID }); exchangeWrapper = new ExchangeWrapper(exchange, zeroEx); const defaultOrderParams = { |