From 56f7dd75386ee6500402714f7b3eefaede49a033 Mon Sep 17 00:00:00 2001 From: Michael Zhu Date: Tue, 29 Oct 2019 17:16:57 -0700 Subject: [PATCH] fix deployment_manager_test --- .../deployment_manager_test.ts | 35 ++++++++++--------- .../fillorder_test.ts | 1 - 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts b/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts index 1d8031e9ca..7cc4a15424 100644 --- a/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts +++ b/contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts @@ -13,15 +13,6 @@ blockchainTests('Deployment Manager', env => { deploymentManager = await DeploymentManager.deployAsync(env); }); - async function batchAssertAuthoritiesAsync( - authorities: string[], - authorizedContracts: Authorizable[], - ): Promise { - for (const authorized of authorizedContracts) { - expect(await authorized.getAuthorizedAddresses.callAsync()).to.be.deep.eq(authorities); - } - } - async function batchAssertAuthorizedAsync( authorizedAddress: string, authorizedContracts: Authorizable[], @@ -79,14 +70,24 @@ blockchainTests('Deployment Manager', env => { // The other asset proxies should have the exchange and the multi-asset proxy in their // authorities list. - await batchAssertAuthoritiesAsync( - [deploymentManager.assetProxies.multiAssetProxy.address, deploymentManager.exchange.address], - [ - deploymentManager.assetProxies.erc1155Proxy, - deploymentManager.assetProxies.erc20Proxy, - deploymentManager.assetProxies.erc721Proxy, - ], - ); + const erc20ProxyAuthorities = await deploymentManager.assetProxies.erc20Proxy.getAuthorizedAddresses.callAsync(); + expect(erc20ProxyAuthorities).to.deep.eq([ + deploymentManager.staking.zrxVault.address, + deploymentManager.assetProxies.multiAssetProxy.address, + deploymentManager.exchange.address, + ]); + + const erc1155ProxyAuthorities = await deploymentManager.assetProxies.erc1155Proxy.getAuthorizedAddresses.callAsync(); + expect(erc1155ProxyAuthorities).to.deep.eq([ + deploymentManager.assetProxies.multiAssetProxy.address, + deploymentManager.exchange.address, + ]); + + const erc721ProxyAuthorities = await deploymentManager.assetProxies.erc721Proxy.getAuthorizedAddresses.callAsync(); + expect(erc721ProxyAuthorities).to.deep.eq([ + deploymentManager.assetProxies.multiAssetProxy.address, + deploymentManager.exchange.address, + ]); }); }); diff --git a/contracts/integrations/test/internal-integration-tests/fillorder_test.ts b/contracts/integrations/test/internal-integration-tests/fillorder_test.ts index 14552d3e18..ea8f866753 100644 --- a/contracts/integrations/test/internal-integration-tests/fillorder_test.ts +++ b/contracts/integrations/test/internal-integration-tests/fillorder_test.ts @@ -87,7 +87,6 @@ blockchainTests.resets('fillOrder integration tests', env => { StakingProxy: deployment.staking.stakingProxy.address, ZrxVault: deployment.staking.zrxVault.address, }; - console.log(tokenOwners); const tokenContracts = { erc20: { makerToken, takerToken, ZRX: deployment.tokens.zrx, WETH: deployment.tokens.weth }, };