Remove deployer from metacoin and contract tests

1 files changed, 12 insertions, 16 deletions

diff --git a/packages/contracts/test/multi_sig_with_time_lock.ts b/packages/contracts/test/multi_sig_with_time_lock.ts
index 5cc744713..d3d478868 100644
--- a/packages/contracts/test/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/multi_sig_with_time_lock.ts
@@ -14,10 +14,10 @@ import { MultiSigWrapper } from '../util/multi_sig_wrapper';
 import { ContractName, SubmissionContractEventArgs } from '../util/types';
 
 import { chaiSetup } from './utils/chai_setup';
-import { deployer } from './utils/deployer';
-import { provider, web3Wrapper } from './utils/web3_wrapper';
 
-const MULTI_SIG_ABI = artifacts.MultiSigWalletWithTimeLockArtifact.compilerOutput.abi;
+import { defaults, provider, web3Wrapper } from './utils/web3_wrapper';
+
+const MULTI_SIG_ABI = artifacts.MultiSigWalletWithTimeLock.compilerOutput.abi;
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -47,15 +47,13 @@ describe('MultiSigWalletWithTimeLock', () => {
     describe('changeTimeLock', () => {
         describe('initially non-time-locked', async () => {
             before('deploy a wallet', async () => {
-                const multiSigInstance = await deployer.deployAsync(ContractName.MultiSigWalletWithTimeLock, [
+                multiSig = await MultiSigWalletWithTimeLockContract.deploy0xArtifactAsync(
+                    artifacts.MultiSigWalletWithTimeLock,
+                    provider,
+                    defaults,
                     owners,
                     SIGNATURES_REQUIRED,
-                    0,
-                ]);
-                multiSig = new MultiSigWalletWithTimeLockContract(
-                    multiSigInstance.abi,
-                    multiSigInstance.address,
-                    provider,
+                    new BigNumber(0),
                 );
                 multiSigWrapper = new MultiSigWrapper((multiSig as any) as MultiSigWalletContract);
 
@@ -144,15 +142,13 @@ describe('MultiSigWalletWithTimeLock', () => {
         });
         describe('initially time-locked', async () => {
             before('deploy a wallet', async () => {
-                const multiSigInstance = await deployer.deployAsync(ContractName.MultiSigWalletWithTimeLock, [
+                multiSig = await MultiSigWalletWithTimeLockContract.deploy0xArtifactAsync(
+                    artifacts.MultiSigWalletWithTimeLock,
+                    provider,
+                    defaults,
                     owners,
                     SIGNATURES_REQUIRED,
                     SECONDS_TIME_LOCKED,
-                ]);
-                multiSig = new MultiSigWalletWithTimeLockContract(
-                    multiSigInstance.abi,
-                    multiSigInstance.address,
-                    provider,
                 );
                 multiSigWrapper = new MultiSigWrapper((multiSig as any) as MultiSigWalletContract);