aboutsummaryrefslogtreecommitdiffstats
path: root/packages/deployer/test/deployer_test.ts
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2018-04-17 11:47:57 +0800
committerGitHub <noreply@github.com>2018-04-17 11:47:57 +0800
commit79d01fe2d7582266dafedefee2873c9d488f4a20 (patch)
tree5a6dbbf7fcb1dced1ace80c03343ca789dc49b54 /packages/deployer/test/deployer_test.ts
parent0d02037a129a97b6afb724a5316d54730c93c0d8 (diff)
parentd263f7783fabe89cc9714b596068eccdc5babc1c (diff)
downloaddexon-sol-tools-79d01fe2d7582266dafedefee2873c9d488f4a20.tar.gz
dexon-sol-tools-79d01fe2d7582266dafedefee2873c9d488f4a20.tar.zst
dexon-sol-tools-79d01fe2d7582266dafedefee2873c9d488f4a20.zip
Merge branch 'development' into feature/0x.js/remove-hd-wallet-from-test
Diffstat (limited to 'packages/deployer/test/deployer_test.ts')
-rw-r--r--packages/deployer/test/deployer_test.ts16
1 files changed, 3 insertions, 13 deletions
diff --git a/packages/deployer/test/deployer_test.ts b/packages/deployer/test/deployer_test.ts
index a213932f9..238624220 100644
--- a/packages/deployer/test/deployer_test.ts
+++ b/packages/deployer/test/deployer_test.ts
@@ -4,13 +4,7 @@ import 'mocha';
import { Compiler } from '../src/compiler';
import { Deployer } from '../src/deployer';
import { fsWrapper } from '../src/utils/fs_wrapper';
-import {
- CompilerOptions,
- ContractArtifact,
- ContractDirectory,
- ContractNetworkData,
- DoneCallback,
-} from '../src/utils/types';
+import { CompilerOptions, ContractArtifact, ContractNetworkData, DoneCallback } from '../src/utils/types';
import { constructor_args, exchange_binary } from './fixtures/exchange_bin';
import { constants } from './util/constants';
@@ -20,15 +14,11 @@ const expect = chai.expect;
describe('#Deployer', () => {
const artifactsDir = `${__dirname}/fixtures/artifacts`;
+ const contractsDir = `${__dirname}/fixtures/contracts`;
const exchangeArtifactPath = `${artifactsDir}/Exchange.json`;
- const mainContractDir: ContractDirectory = { path: `${__dirname}/fixtures/contracts/main`, namespace: '' };
- const baseContractDir: ContractDirectory = { path: `${__dirname}/fixtures/contracts/base`, namespace: 'base' };
- const contractDirs: Set<ContractDirectory> = new Set();
- contractDirs.add(mainContractDir);
- contractDirs.add(baseContractDir);
const compilerOpts: CompilerOptions = {
artifactsDir,
- contractDirs,
+ contractsDir,
networkId: constants.networkId,
optimizerEnabled: constants.optimizerEnabled,
specifiedContracts: new Set(constants.specifiedContracts),