diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-10 19:44:15 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-12 18:50:38 +0800 |
commit | f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1 (patch) | |
tree | 98ff3c9137cdce1a44b65dc7dc89a7a72f70b9de /packages/deployer/test/deployer_test.ts | |
parent | ed0c64fdcf5c180107f54ad916c11c4901a4c01c (diff) | |
download | dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.gz dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.bz2 dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.lz dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.xz dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.tar.zst dexon-sol-tools-f2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1.zip |
Revert "Merge pull request #493 from hysz/features/deployer/multipleCodebaseSupport"
This reverts commit 70d403e6f8c56bc70e6d3471a770b9bbff5d72e7, reversing
changes made to 073bf738ddb271b6b4158798baf4cac3cb0608e9.
Diffstat (limited to 'packages/deployer/test/deployer_test.ts')
-rw-r--r-- | packages/deployer/test/deployer_test.ts | 16 |
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), |