From 3d58b38e4e8565e7ee10e4d6c9f57cd745957ab4 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 7 May 2018 22:11:09 +0200
Subject: Remove deployer from metacoin and contract tests

---
 packages/metacoin/src/global.d.ts        |  4 ++++
 packages/metacoin/test/metacoin_test.ts  | 11 +++++++----
 packages/metacoin/test/utils/config.ts   |  4 ++++
 packages/metacoin/test/utils/deployer.ts | 17 -----------------
 4 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 packages/metacoin/src/global.d.ts
 delete mode 100644 packages/metacoin/test/utils/deployer.ts

(limited to 'packages/metacoin')

diff --git a/packages/metacoin/src/global.d.ts b/packages/metacoin/src/global.d.ts
new file mode 100644
index 000000000..783b92913
--- /dev/null
+++ b/packages/metacoin/src/global.d.ts
@@ -0,0 +1,4 @@
+declare module '*.json' {
+    const value: any;
+    export default value;
+}
diff --git a/packages/metacoin/test/metacoin_test.ts b/packages/metacoin/test/metacoin_test.ts
index 51830d1ef..6fe751d12 100644
--- a/packages/metacoin/test/metacoin_test.ts
+++ b/packages/metacoin/test/metacoin_test.ts
@@ -1,15 +1,19 @@
+import { ContractArtifact } from '@0xproject/deployer';
 import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
 import { LogWithDecodedArgs } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 
+import * as MetacoinArtifact from '../artifacts/Metacoin.json';
 import { MetacoinContract, TransferContractEventArgs } from '../src/contract_wrappers/metacoin';
 
 import { chaiSetup } from './utils/chai_setup';
-import { deployer } from './utils/deployer';
+import { config } from './utils/config';
 import { provider, web3Wrapper } from './utils/web3_wrapper';
 
+const artifact: ContractArtifact = MetacoinArtifact as any;
+
 chaiSetup.configure();
 const { expect } = chai;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -19,9 +23,8 @@ describe('Metacoin', () => {
     const ownerAddress = devConstants.TESTRPC_FIRST_ADDRESS;
     const INITIAL_BALANCE = new BigNumber(10000);
     before(async () => {
-        const metacoinInstance = await deployer.deployAsync('Metacoin');
-        web3Wrapper.abiDecoder.addABI(metacoinInstance.abi);
-        metacoin = new MetacoinContract(metacoinInstance.abi, metacoinInstance.address, provider);
+        metacoin = await MetacoinContract.deploy0xArtifactAsync(artifact, provider, config.defaults);
+        web3Wrapper.abiDecoder.addABI(metacoin.abi);
     });
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();
diff --git a/packages/metacoin/test/utils/config.ts b/packages/metacoin/test/utils/config.ts
index d3a830754..8ae6d39a2 100644
--- a/packages/metacoin/test/utils/config.ts
+++ b/packages/metacoin/test/utils/config.ts
@@ -1,3 +1,4 @@
+import { devConstants } from '@0xproject/dev-utils';
 import * as path from 'path';
 
 export const config = {
@@ -5,5 +6,8 @@ export const config = {
     artifactsDir: path.resolve(__dirname, '../../artifacts'),
     contractsDir: path.resolve(__dirname, '../../contracts'),
     ganacheLogFile: 'ganache.log',
+    defaults: {
+        from: devConstants.TESTRPC_FIRST_ADDRESS,
+    },
     mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic',
 };
diff --git a/packages/metacoin/test/utils/deployer.ts b/packages/metacoin/test/utils/deployer.ts
deleted file mode 100644
index 5a631fa0a..000000000
--- a/packages/metacoin/test/utils/deployer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Deployer } from '@0xproject/deployer';
-import { devConstants } from '@0xproject/dev-utils';
-import * as path from 'path';
-
-import { config } from './config';
-import { web3Wrapper } from './web3_wrapper';
-
-const deployerOpts = {
-    provider: web3Wrapper.getProvider(),
-    artifactsDir: config.artifactsDir,
-    networkId: config.networkId,
-    defaults: {
-        from: devConstants.TESTRPC_FIRST_ADDRESS,
-    },
-};
-
-export const deployer = new Deployer(deployerOpts);
-- 
cgit v1.2.3