From 745da8e363b6aff59d4b40a1a2805a559ed432f0 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 29 Sep 2019 17:36:55 -0700 Subject: [PATCH] Fix tests --- contracts/staking/test/migration_test.ts | 5 +++- .../staking/test/unit_tests/exchange_test.ts | 28 ------------------- .../staking/test/unit_tests/params_test.ts | 1 + .../staking/test/unit_tests/zrx_vault_test.ts | 2 ++ contracts/staking/test/utils/api_wrapper.ts | 5 ++++ 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/contracts/staking/test/migration_test.ts b/contracts/staking/test/migration_test.ts index 5dd57b4370..e20569f8ea 100644 --- a/contracts/staking/test/migration_test.ts +++ b/contracts/staking/test/migration_test.ts @@ -28,6 +28,7 @@ blockchainTests('Migration tests', env => { env.txDefaults, artifacts, ); + await stakingContract.addAuthorizedAddress.awaitTransactionSuccessAsync(authorizedAddress); }); describe('StakingProxy', () => { @@ -37,13 +38,15 @@ blockchainTests('Migration tests', env => { let revertAddress: string; async function deployStakingProxyAsync(stakingContractAddress?: string): Promise { - return TestStakingProxyContract.deployFrom0xArtifactAsync( + const proxyContract = await TestStakingProxyContract.deployFrom0xArtifactAsync( artifacts.TestStakingProxy, env.provider, env.txDefaults, artifacts, stakingContractAddress || constants.NULL_ADDRESS, ); + await proxyContract.addAuthorizedAddress.awaitTransactionSuccessAsync(authorizedAddress); + return proxyContract; } before(async () => { diff --git a/contracts/staking/test/unit_tests/exchange_test.ts b/contracts/staking/test/unit_tests/exchange_test.ts index 8acd5b6e7b..b225d0c055 100644 --- a/contracts/staking/test/unit_tests/exchange_test.ts +++ b/contracts/staking/test/unit_tests/exchange_test.ts @@ -95,20 +95,6 @@ blockchainTests.resets('Exchange Unit Tests', env => { return expect(tx).to.revertWith(expectedError); }); - it('should successfully add an exchange if called by the (authorized) owner', async () => { - // Register a new exchange. - const receipt = await exchangeManager.addExchangeAddress.awaitTransactionSuccessAsync(nonExchange, { - from: owner, - }); - - // Ensure that the logged event was correct. - verifyExchangeManagerEvent(ExchangeManagerEventType.ExchangeAdded, nonExchange, receipt); - - // Ensure that the exchange was successfully registered. - const isValidExchange = await exchangeManager.validExchanges.callAsync(nonExchange); - expect(isValidExchange).to.be.true(); - }); - it('should successfully add an exchange if called by an authorized address', async () => { // Register a new exchange. const receipt = await exchangeManager.addExchangeAddress.awaitTransactionSuccessAsync(nonExchange, { @@ -142,20 +128,6 @@ blockchainTests.resets('Exchange Unit Tests', env => { return expect(tx).to.revertWith(expectedError); }); - it('should successfully remove an exchange if called by the (authorized) owner', async () => { - // Remove the registered exchange. - const receipt = await exchangeManager.removeExchangeAddress.awaitTransactionSuccessAsync(exchange, { - from: owner, - }); - - // Ensure that the logged event was correct. - verifyExchangeManagerEvent(ExchangeManagerEventType.ExchangeRemoved, exchange, receipt); - - // Ensure that the exchange was removed. - const isValidExchange = await exchangeManager.validExchanges.callAsync(exchange); - expect(isValidExchange).to.be.false(); - }); - it('should successfully remove a registered exchange if called by an authorized address', async () => { // Remove the registered exchange. const receipt = await exchangeManager.removeExchangeAddress.awaitTransactionSuccessAsync(exchange, { diff --git a/contracts/staking/test/unit_tests/params_test.ts b/contracts/staking/test/unit_tests/params_test.ts index 82b1d62c92..5a0a45fe43 100644 --- a/contracts/staking/test/unit_tests/params_test.ts +++ b/contracts/staking/test/unit_tests/params_test.ts @@ -21,6 +21,7 @@ blockchainTests('Configurable Parameters unit tests', env => { env.txDefaults, artifacts, ); + await testContract.addAuthorizedAddress.awaitTransactionSuccessAsync(authorizedAddress); }); blockchainTests.resets('setParams()', () => { diff --git a/contracts/staking/test/unit_tests/zrx_vault_test.ts b/contracts/staking/test/unit_tests/zrx_vault_test.ts index 84c0292b6d..d2db51e722 100644 --- a/contracts/staking/test/unit_tests/zrx_vault_test.ts +++ b/contracts/staking/test/unit_tests/zrx_vault_test.ts @@ -57,6 +57,8 @@ blockchainTests.resets('ZrxVault unit tests', env => { zrxTokenContract.address, ); + await zrxVault.addAuthorizedAddress.awaitTransactionSuccessAsync(owner); + // configure erc20 proxy to accept calls from zrx vault await erc20ProxyContract.addAuthorizedAddress.awaitTransactionSuccessAsync(zrxVault.address); }); diff --git a/contracts/staking/test/utils/api_wrapper.ts b/contracts/staking/test/utils/api_wrapper.ts index 9c84859697..c40ef7fbaa 100644 --- a/contracts/staking/test/utils/api_wrapper.ts +++ b/contracts/staking/test/utils/api_wrapper.ts @@ -236,6 +236,8 @@ export async function deployAndConfigureContractsAsync( zrxTokenContract.address, ); + await zrxVaultContract.addAuthorizedAddress.awaitTransactionSuccessAsync(ownerAddress); + // deploy staking contract const stakingContract = await TestStakingContract.deployFrom0xArtifactAsync( customStakingArtifact !== undefined ? customStakingArtifact : artifacts.TestStaking, @@ -263,6 +265,9 @@ export async function deployAndConfigureContractsAsync( stakingContract.address, readOnlyProxyContract.address, ); + + await stakingProxyContract.addAuthorizedAddress.awaitTransactionSuccessAsync(ownerAddress); + // deploy cobb douglas contract const cobbDouglasContract = await TestCobbDouglasContract.deployFrom0xArtifactAsync( artifacts.TestCobbDouglas,