Fix tests

3 files changed, 0 insertions, 651 deletions

diff --git a/packages/contracts/test/asset_proxy_dispatcher/auth.ts b/packages/contracts/test/asset_proxy_dispatcher/auth.ts
deleted file mode 100644
index 9d8645ab7..000000000
--- a/packages/contracts/test/asset_proxy_dispatcher/auth.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import * as chai from 'chai';
-import * as Web3 from 'web3';
-
-import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher';
-import { constants } from '../../src/utils/constants';
-import { ContractName } from '../../src/utils/types';
-import { chaiSetup } from '../utils/chai_setup';
-import { deployer } from '../utils/deployer';
-import { provider, web3Wrapper } from '../utils/web3_wrapper';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('AssetProxyDispatcher (Authorization Methods)', () => {
-    let owner: string;
-    let notOwner: string;
-    let address: string;
-    let assetProxyDispatcher: AssetProxyDispatcherContract;
-    before(async () => {
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        owner = address = accounts[0];
-        notOwner = accounts[1];
-        const assetProxyDispatcherInstance = await deployer.deployAsync(ContractName.AssetProxyDispatcher);
-        assetProxyDispatcher = new AssetProxyDispatcherContract(
-            assetProxyDispatcherInstance.abi,
-            assetProxyDispatcherInstance.address,
-            provider,
-        );
-    });
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    describe('addAuthorizedAddress', () => {
-        it('should throw if not called by owner', async () => {
-            return expect(
-                assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(notOwner, { from: notOwner }),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-        it('should allow owner to add an authorized address', async () => {
-            await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
-            const isAuthorized = await assetProxyDispatcher.authorized.callAsync(address);
-            expect(isAuthorized).to.be.true();
-        });
-        it('should throw if owner attempts to authorize a duplicate address', async () => {
-            await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
-            return expect(
-                assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(address, { from: owner }),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-    });
-
-    describe('removeAuthorizedAddress', () => {
-        it('should throw if not called by owner', async () => {
-            await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
-            return expect(
-                assetProxyDispatcher.removeAuthorizedAddress.sendTransactionAsync(address, {
-                    from: notOwner,
-                }),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should allow owner to remove an authorized address', async () => {
-            await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
-            await assetProxyDispatcher.removeAuthorizedAddress.sendTransactionAsync(address, {
-                from: owner,
-            });
-            const isAuthorized = await assetProxyDispatcher.authorized.callAsync(address);
-            expect(isAuthorized).to.be.false();
-        });
-
-        it('should throw if owner attempts to remove an address that is not authorized', async () => {
-            return expect(
-                assetProxyDispatcher.removeAuthorizedAddress.sendTransactionAsync(address, {
-                    from: owner,
-                }),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-    });
-
-    describe('getAuthorizedAddresses', () => {
-        it('should return all authorized addresses', async () => {
-            const initial = await assetProxyDispatcher.getAuthorizedAddresses.callAsync();
-            expect(initial).to.have.length(0);
-            await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(address, {
-                from: owner,
-            });
-            const afterAdd = await assetProxyDispatcher.getAuthorizedAddresses.callAsync();
-            expect(afterAdd).to.have.length(1);
-            expect(afterAdd).to.include(address);
-
-            await assetProxyDispatcher.removeAuthorizedAddress.sendTransactionAsync(address, {
-                from: owner,
-            });
-            const afterRemove = await assetProxyDispatcher.getAuthorizedAddresses.callAsync();
-            expect(afterRemove).to.have.length(0);
-        });
-    });
-});
diff --git a/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts b/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts
deleted file mode 100644
index b5630d807..000000000
--- a/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-import { ZeroEx } from '0x.js';
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { BigNumber } from '@0xproject/utils';
-import * as chai from 'chai';
-import * as Web3 from 'web3';
-
-import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher';
-import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token';
-import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy';
-import { assetProxyUtils } from '../../src/utils/asset_proxy_utils';
-import { constants } from '../../src/utils/constants';
-import { ERC20Wrapper } from '../../src/utils/erc20_wrapper';
-import { ERC721Wrapper } from '../../src/utils/erc721_wrapper';
-import { AssetProxyId, ContractName } from '../../src/utils/types';
-import { chaiSetup } from '../utils/chai_setup';
-import { deployer } from '../utils/deployer';
-import { provider, web3Wrapper } from '../utils/web3_wrapper';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('AssetProxyDispatcher', () => {
-    let owner: string;
-    let notOwner: string;
-    let notAuthorized: string;
-    let exchangeAddress: string;
-    let makerAddress: string;
-    let takerAddress: string;
-
-    let zrx: DummyERC20TokenContract;
-    let erc20Proxy: ERC20ProxyContract;
-    let erc721Proxy: ERC721ProxyContract;
-    let assetProxyDispatcher: AssetProxyDispatcherContract;
-
-    let erc20Wrapper: ERC20Wrapper;
-    let erc721Wrapper: ERC721Wrapper;
-
-    before(async () => {
-        // Setup accounts & addresses
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        const usedAddresses = ([owner, notOwner, exchangeAddress, makerAddress, takerAddress] = accounts);
-        notAuthorized = notOwner;
-
-        erc20Wrapper = new ERC20Wrapper(deployer, provider, usedAddresses, owner);
-        erc721Wrapper = new ERC721Wrapper(deployer, provider, usedAddresses, owner);
-
-        [zrx] = await erc20Wrapper.deployDummyERC20TokensAsync();
-        erc20Proxy = await erc20Wrapper.deployERC20ProxyAsync();
-        await erc20Wrapper.setBalancesAndAllowancesAsync();
-
-        erc721Proxy = await erc721Wrapper.deployERC721ProxyAsync();
-
-        const assetProxyDispatcherInstance = await deployer.deployAsync(ContractName.AssetProxyDispatcher);
-        assetProxyDispatcher = new AssetProxyDispatcherContract(
-            assetProxyDispatcherInstance.abi,
-            assetProxyDispatcherInstance.address,
-            provider,
-        );
-        await assetProxyDispatcher.addAuthorizedAddress.sendTransactionAsync(exchangeAddress, {
-            from: owner,
-        });
-        await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
-            from: owner,
-        });
-        await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
-            from: owner,
-        });
-    });
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    describe('registerAssetProxy', () => {
-        it('should record proxy upon registration', async () => {
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            const proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(erc20Proxy.address);
-        });
-
-        it('should be able to record multiple proxies', async () => {
-            // Record first proxy
-            const prevERC20ProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevERC20ProxyAddress,
-                { from: owner },
-            );
-            let proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(erc20Proxy.address);
-            // Record another proxy
-            const prevERC721ProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC721,
-                erc721Proxy.address,
-                prevERC721ProxyAddress,
-                { from: owner },
-            );
-            proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC721);
-            expect(proxyAddress).to.be.equal(erc721Proxy.address);
-        });
-
-        it('should replace proxy address upon re-registration', async () => {
-            // Initial registration
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            let proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(erc20Proxy.address);
-            // Deploy a new version of the ERC20 Transfer Proxy contract
-            const newErc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
-            const newErc20TransferProxy = new ERC20ProxyContract(
-                newErc20TransferProxyInstance.abi,
-                newErc20TransferProxyInstance.address,
-                provider,
-            );
-            // Register new ERC20 Transfer Proxy contract
-            const newAddress = newErc20TransferProxy.address;
-            const currentAddress = erc20Proxy.address;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                newAddress,
-                currentAddress,
-                { from: owner },
-            );
-            // Verify new asset proxy has replaced initial version
-            proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(newAddress);
-        });
-
-        it('should throw if registering with incorrect "currentAssetProxyAddress" field', async () => {
-            // Initial registration
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            const proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(erc20Proxy.address);
-            // The following transaction will throw because the currentAddress is no longer ZeroEx.NULL_ADDRESS
-            return expect(
-                assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                    AssetProxyId.ERC20,
-                    erc20Proxy.address,
-                    ZeroEx.NULL_ADDRESS,
-                    { from: owner },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should be able to reset proxy address to NULL', async () => {
-            // Initial registration
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            const proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(erc20Proxy.address);
-            // The following transaction will reset the proxy address
-            const newProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                newProxyAddress,
-                erc20Proxy.address,
-                { from: owner },
-            );
-            const finalProxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(finalProxyAddress).to.be.equal(newProxyAddress);
-        });
-
-        it('should throw if requesting address is not owner', async () => {
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            return expect(
-                assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                    AssetProxyId.ERC20,
-                    erc20Proxy.address,
-                    prevProxyAddress,
-                    { from: notOwner },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-    });
-
-    describe('getAssetProxy', () => {
-        it('should return correct address of registered proxy', async () => {
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            const proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(erc20Proxy.address);
-        });
-
-        it('should return NULL address if requesting non-existent proxy', async () => {
-            const proxyAddress = await assetProxyDispatcher.getAssetProxy.callAsync(AssetProxyId.ERC20);
-            expect(proxyAddress).to.be.equal(ZeroEx.NULL_ADDRESS);
-        });
-    });
-
-    describe('transferFrom', () => {
-        it('should dispatch transfer to registered proxy', async () => {
-            // Register ERC20 proxy
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(10);
-            await assetProxyDispatcher.transferFrom.sendTransactionAsync(
-                encodedProxyMetadata,
-                makerAddress,
-                takerAddress,
-                amount,
-                { from: exchangeAddress },
-            );
-            // Verify transfer was successful
-            const newBalances = await erc20Wrapper.getBalancesAsync();
-            expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
-                erc20Balances[makerAddress][zrx.address].minus(amount),
-            );
-            expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
-                erc20Balances[takerAddress][zrx.address].add(amount),
-            );
-        });
-
-        it('should throw if dispatching to unregistered proxy', async () => {
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(10);
-            return expect(
-                assetProxyDispatcher.transferFrom.sendTransactionAsync(
-                    encodedProxyMetadata,
-                    makerAddress,
-                    takerAddress,
-                    amount,
-                    { from: exchangeAddress },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should throw on transfer if requesting address is not authorized', async () => {
-            // Register ERC20 proxy
-            const prevProxyAddress = ZeroEx.NULL_ADDRESS;
-            await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
-                AssetProxyId.ERC20,
-                erc20Proxy.address,
-                prevProxyAddress,
-                { from: owner },
-            );
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(10);
-            return expect(
-                assetProxyDispatcher.transferFrom.sendTransactionAsync(
-                    encodedProxyMetadata,
-                    makerAddress,
-                    takerAddress,
-                    amount,
-                    { from: notAuthorized },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-    });
-});
diff --git a/packages/contracts/test/asset_proxy_dispatcher/proxies.ts b/packages/contracts/test/asset_proxy_dispatcher/proxies.ts
deleted file mode 100644
index 830f40e13..000000000
--- a/packages/contracts/test/asset_proxy_dispatcher/proxies.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import { ZeroEx } from '0x.js';
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { BigNumber } from '@0xproject/utils';
-import * as chai from 'chai';
-import * as Web3 from 'web3';
-
-import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher';
-import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token';
-import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy';
-import { assetProxyUtils } from '../../src/utils/asset_proxy_utils';
-import { constants } from '../../src/utils/constants';
-import { ERC20Wrapper } from '../../src/utils/erc20_wrapper';
-import { ERC721Wrapper } from '../../src/utils/erc721_wrapper';
-import { AssetProxyId, ContractName } from '../../src/utils/types';
-import { chaiSetup } from '../utils/chai_setup';
-import { deployer } from '../utils/deployer';
-import { provider, web3Wrapper } from '../utils/web3_wrapper';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('Asset Transfer Proxies', () => {
-    let owner: string;
-    let notAuthorized: string;
-    let assetProxyDispatcherAddress: string;
-    let makerAddress: string;
-    let takerAddress: string;
-
-    let zrx: DummyERC20TokenContract;
-    let erc721Token: DummyERC721TokenContract;
-    let erc20Proxy: ERC20ProxyContract;
-    let erc721Proxy: ERC721ProxyContract;
-
-    let erc20Wrapper: ERC20Wrapper;
-    let erc721Wrapper: ERC721Wrapper;
-    let erc721MakerTokenId: BigNumber;
-
-    before(async () => {
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        const usedAddresses = ([
-            owner,
-            notAuthorized,
-            assetProxyDispatcherAddress,
-            makerAddress,
-            takerAddress,
-        ] = accounts);
-
-        erc20Wrapper = new ERC20Wrapper(deployer, provider, usedAddresses, owner);
-        erc721Wrapper = new ERC721Wrapper(deployer, provider, usedAddresses, owner);
-
-        [zrx] = await erc20Wrapper.deployDummyERC20TokensAsync();
-        erc20Proxy = await erc20Wrapper.deployERC20ProxyAsync();
-        await erc20Wrapper.setBalancesAndAllowancesAsync();
-        await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcherAddress, {
-            from: owner,
-        });
-
-        [erc721Token] = await erc721Wrapper.deployDummyERC721TokensAsync();
-        erc721Proxy = await erc721Wrapper.deployERC721ProxyAsync();
-        await erc721Wrapper.setBalancesAndAllowancesAsync();
-        const erc721Balances = await erc721Wrapper.getBalancesAsync();
-        erc721MakerTokenId = erc721Balances[makerAddress][erc721Token.address][0];
-        await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcherAddress, {
-            from: owner,
-        });
-    });
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    describe('Transfer Proxy - ERC20', () => {
-        it('should successfully transfer tokens', async () => {
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(10);
-            await erc20Proxy.transferFrom.sendTransactionAsync(
-                encodedProxyMetadata,
-                makerAddress,
-                takerAddress,
-                amount,
-                { from: assetProxyDispatcherAddress },
-            );
-            // Verify transfer was successful
-            const newBalances = await erc20Wrapper.getBalancesAsync();
-            expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
-                erc20Balances[makerAddress][zrx.address].minus(amount),
-            );
-            expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
-                erc20Balances[takerAddress][zrx.address].add(amount),
-            );
-        });
-
-        it('should do nothing if transferring 0 amount of a token', async () => {
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(0);
-            await erc20Proxy.transferFrom.sendTransactionAsync(
-                encodedProxyMetadata,
-                makerAddress,
-                takerAddress,
-                amount,
-                { from: assetProxyDispatcherAddress },
-            );
-            // Verify transfer was successful
-            const newBalances = await erc20Wrapper.getBalancesAsync();
-            expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
-                erc20Balances[makerAddress][zrx.address],
-            );
-            expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
-                erc20Balances[takerAddress][zrx.address],
-            );
-        });
-
-        it('should throw if allowances are too low', async () => {
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Create allowance less than transfer amount. Set allowance on proxy.
-            const allowance = new BigNumber(0);
-            const transferAmount = new BigNumber(10);
-            await zrx.approve.sendTransactionAsync(erc20Proxy.address, allowance, {
-                from: makerAddress,
-            });
-            // Perform a transfer; expect this to fail.
-            return expect(
-                erc20Proxy.transferFrom.sendTransactionAsync(
-                    encodedProxyMetadata,
-                    makerAddress,
-                    takerAddress,
-                    transferAmount,
-                    { from: notAuthorized },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should throw if requesting address is not authorized', async () => {
-            // Construct metadata for ERC20 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC20ProxyData(zrx.address);
-            // Perform a transfer from makerAddress to takerAddress
-            const amount = new BigNumber(10);
-            return expect(
-                erc20Proxy.transferFrom.sendTransactionAsync(encodedProxyMetadata, makerAddress, takerAddress, amount, {
-                    from: notAuthorized,
-                }),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-    });
-
-    describe('Transfer Proxy - ERC721', () => {
-        it('should successfully transfer tokens', async () => {
-            // Construct metadata for ERC721 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC721ProxyData(erc721Token.address, erc721MakerTokenId);
-            // Verify pre-condition
-            const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-            expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(1);
-            await erc721Proxy.transferFrom.sendTransactionAsync(
-                encodedProxyMetadata,
-                makerAddress,
-                takerAddress,
-                amount,
-                { from: assetProxyDispatcherAddress },
-            );
-            // Verify transfer was successful
-            const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-            expect(newOwnerMakerAsset).to.be.bignumber.equal(takerAddress);
-        });
-
-        it('should throw if transferring 0 amount of a token', async () => {
-            // Construct metadata for ERC721 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC721ProxyData(erc721Token.address, erc721MakerTokenId);
-            // Verify pre-condition
-            const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-            expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(0);
-            return expect(
-                erc721Proxy.transferFrom.sendTransactionAsync(
-                    encodedProxyMetadata,
-                    makerAddress,
-                    takerAddress,
-                    amount,
-                    { from: assetProxyDispatcherAddress },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should throw if transferring > 1 amount of a token', async () => {
-            // Construct metadata for ERC721 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC721ProxyData(erc721Token.address, erc721MakerTokenId);
-            // Verify pre-condition
-            const ownerMakerAsset = await erc721Token.ownerOf.callAsync(erc721MakerTokenId);
-            expect(ownerMakerAsset).to.be.bignumber.equal(makerAddress);
-            // Perform a transfer from makerAddress to takerAddress
-            const erc20Balances = await erc20Wrapper.getBalancesAsync();
-            const amount = new BigNumber(500);
-            return expect(
-                erc721Proxy.transferFrom.sendTransactionAsync(
-                    encodedProxyMetadata,
-                    makerAddress,
-                    takerAddress,
-                    amount,
-                    { from: assetProxyDispatcherAddress },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should throw if allowances are too low', async () => {
-            // Construct metadata for ERC721 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC721ProxyData(erc721Token.address, erc721MakerTokenId);
-            // Remove transfer approval for makerAddress.
-            await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, false, {
-                from: makerAddress,
-            });
-            // Perform a transfer; expect this to fail.
-            const amount = new BigNumber(1);
-            return expect(
-                erc20Proxy.transferFrom.sendTransactionAsync(encodedProxyMetadata, makerAddress, takerAddress, amount, {
-                    from: notAuthorized,
-                }),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-
-        it('should throw if requesting address is not authorized', async () => {
-            // Construct metadata for ERC721 proxy
-            const encodedProxyMetadata = assetProxyUtils.encodeERC721ProxyData(erc721Token.address, erc721MakerTokenId);
-            // Perform a transfer from makerAddress to takerAddress
-            const amount = new BigNumber(1);
-            return expect(
-                erc721Proxy.transferFrom.sendTransactionAsync(
-                    encodedProxyMetadata,
-                    makerAddress,
-                    takerAddress,
-                    amount,
-                    { from: notAuthorized },
-                ),
-            ).to.be.rejectedWith(constants.REVERT);
-        });
-    });
-});