diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-05-05 10:09:01 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-05-25 06:39:19 +0800 |
commit | 22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e (patch) | |
tree | 3eae13e15b47bae477c56df31c4f690cc935316a /packages/contracts/test | |
parent | cc44f5f75d8a1152be9fd49491a9c194cfa2b285 (diff) | |
download | dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.tar dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.tar.gz dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.tar.bz2 dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.tar.lz dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.tar.xz dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.tar.zst dexon-0x-contracts-22ad9e1e1a0c6d2fa5c1b1249d02ef119ef4517e.zip |
Address feedback, rename contract to AssetProxyOwner
Diffstat (limited to 'packages/contracts/test')
-rw-r--r-- | packages/contracts/test/asset_proxy_owner.ts (renamed from packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts) | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts b/packages/contracts/test/asset_proxy_owner.ts index e384e093b..7b470e82e 100644 --- a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts +++ b/packages/contracts/test/asset_proxy_owner.ts @@ -6,14 +6,14 @@ import * as _ from 'lodash'; import 'make-promises-safe'; import * as Web3 from 'web3'; -import { AuthorizableContract } from '../src/contract_wrappers/generated/authorizable'; import { + AssetProxyOwnerContract, AssetProxyRegistrationContractEventArgs, ExecutionContractEventArgs, ExecutionFailureContractEventArgs, - MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract, SubmissionContractEventArgs, -} from '../src/contract_wrappers/generated/multi_sig_wallet_with_time_lock_except_remove_authorized_address'; +} from '../src/contract_wrappers/generated/asset_proxy_owner'; +import { MixinAuthorizableContract } from '../src/contract_wrappers/generated/mixin_authorizable'; import { artifacts } from '../src/utils/artifacts'; import { chaiSetup } from '../src/utils/chai_setup'; import { constants } from '../src/utils/constants'; @@ -25,37 +25,37 @@ const expect = chai.expect; const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID }); -describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => { +describe('AssetProxyOwner', () => { let owners: string[]; let authorized: string; const requiredApprovals = new BigNumber(2); const SECONDS_TIME_LOCKED = new BigNumber(1000000); - let erc20Proxy: AuthorizableContract; - let erc721Proxy: AuthorizableContract; - let multiSig: MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract; + let erc20Proxy: MixinAuthorizableContract; + let erc721Proxy: MixinAuthorizableContract; + let multiSig: AssetProxyOwnerContract; let multiSigWrapper: MultiSigWrapper; before(async () => { const accounts = await web3Wrapper.getAvailableAddressesAsync(); owners = [accounts[0], accounts[1]]; const initialOwner = (authorized = accounts[0]); - erc20Proxy = await AuthorizableContract.deployFrom0xArtifactAsync(artifacts.Authorizable, provider, txDefaults); - erc721Proxy = await AuthorizableContract.deployFrom0xArtifactAsync( - artifacts.Authorizable, + erc20Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync(artifacts.MixinAuthorizable, provider, txDefaults); + erc721Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync( + artifacts.MixinAuthorizable, provider, txDefaults, ); const defaultAssetProxyContractAddresses: string[] = []; - multiSig = await MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract.deployFrom0xArtifactAsync( - artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress, + multiSig = await AssetProxyOwnerContract.deployFrom0xArtifactAsync( + artifacts.AssetProxyOwner, provider, txDefaults, owners, requiredApprovals, SECONDS_TIME_LOCKED, defaultAssetProxyContractAddresses, - ); + ]); multiSigWrapper = new MultiSigWrapper(multiSig, zeroEx); await erc20Proxy.transferOwnership.sendTransactionAsync(multiSig.address, { from: initialOwner }); await erc721Proxy.transferOwnership.sendTransactionAsync(multiSig.address, { from: initialOwner }); @@ -70,8 +70,8 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => { describe('constructor', () => { it('should register passed in assetProxyContracts', async () => { const assetProxyContractAddresses = [erc20Proxy.address, erc721Proxy.address]; - const newMultiSig = await MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract.deployFrom0xArtifactAsync( - artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress, + const newMultiSig = await AssetProxyOwnerContract.deployFrom0xArtifactAsync( + artifacts.AssetProxyOwner, provider, txDefaults, owners, @@ -87,8 +87,8 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => { it('should throw if a null address is included in assetProxyContracts', async () => { const assetProxyContractAddresses = [erc20Proxy.address, ZeroEx.NULL_ADDRESS]; expect( - MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract.deployFrom0xArtifactAsync( - artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress, + AssetProxyOwnerContract.deployFrom0xArtifactAsync( + artifacts.AssetProxyOwner, provider, txDefaults, owners, |