aboutsummaryrefslogtreecommitdiffstats
path: root/packages/deployer/test
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-04-16 22:38:55 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-04-16 23:43:59 +0800
commitd8ef76fd5efe63ec8f6205a73494ce388e64391f (patch)
tree22a5740584029830e37961136e229938b8f735f4 /packages/deployer/test
parente5cf41b3134d6cd5fdda995aa81ec23e51bb5145 (diff)
downloaddexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.tar
dexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.tar.gz
dexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.tar.bz2
dexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.tar.lz
dexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.tar.xz
dexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.tar.zst
dexon-sol-tools-d8ef76fd5efe63ec8f6205a73494ce388e64391f.zip
Rename resolver to sol-resolver
Diffstat (limited to 'packages/deployer/test')
-rw-r--r--packages/deployer/test/compiler_utils_test.ts29
-rw-r--r--packages/deployer/test/fixtures/contracts/Exchange.sol2
-rw-r--r--packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol2
3 files changed, 20 insertions, 13 deletions
diff --git a/packages/deployer/test/compiler_utils_test.ts b/packages/deployer/test/compiler_utils_test.ts
index 7e7ae1200..e2b95f289 100644
--- a/packages/deployer/test/compiler_utils_test.ts
+++ b/packages/deployer/test/compiler_utils_test.ts
@@ -47,24 +47,31 @@ describe('Compiler utils', () => {
});
describe('#parseDependencies', () => {
it('correctly parses Exchange dependencies', async () => {
- const exchangeSource = await fsWrapper.readFileAsync(`${__dirname}/fixtures/contracts/Exchange.sol`, {
+ const path = `${__dirname}/fixtures/contracts/Exchange.sol`;
+ const source = await fsWrapper.readFileAsync(path, {
encoding: 'utf8',
});
- expect(parseDependencies(exchangeSource)).to.be.deep.equal(['ERC20', 'TokenTransferProxy', 'SafeMath']);
+ expect(parseDependencies({ source, path })).to.be.deep.equal([
+ 'zeppelin-solidity/contracts/token/ERC20/ERC20.sol',
+ '/home/circleci/repo/packages/deployer/lib/test/fixtures/contracts/TokenTransferProxy.sol',
+ '/home/circleci/repo/packages/deployer/lib/test/fixtures/contracts/base/SafeMath.sol',
+ ]);
});
it('correctly parses TokenTransferProxy dependencies', async () => {
- const exchangeSource = await fsWrapper.readFileAsync(
- `${__dirname}/fixtures/contracts/TokenTransferProxy.sol`,
- {
- encoding: 'utf8',
- },
- );
- expect(parseDependencies(exchangeSource)).to.be.deep.equal(['Ownable', 'ERC20']);
+ const path = `${__dirname}/fixtures/contracts/TokenTransferProxy.sol`;
+ const source = await fsWrapper.readFileAsync(path, {
+ encoding: 'utf8',
+ });
+ expect(parseDependencies({ source, path })).to.be.deep.equal([
+ 'zeppelin-solidity/contracts/ownership/Ownable.sol',
+ 'zeppelin-solidity/contracts/token/ERC20/ERC20.sol',
+ ]);
});
// TODO: For now that doesn't work. This will work after we switch to a grammar-based parser
it.skip('correctly parses commented out dependencies', async () => {
- const contractWithCommentedOutDependencies = `// import "./TokenTransferProxy.sol";`;
- expect(parseDependencies(contractWithCommentedOutDependencies)).to.be.deep.equal([]);
+ const path = '';
+ const source = `// import "./TokenTransferProxy.sol";`;
+ expect(parseDependencies({ path, source })).to.be.deep.equal([]);
});
});
});
diff --git a/packages/deployer/test/fixtures/contracts/Exchange.sol b/packages/deployer/test/fixtures/contracts/Exchange.sol
index 1249d21ed..e3725335b 100644
--- a/packages/deployer/test/fixtures/contracts/Exchange.sol
+++ b/packages/deployer/test/fixtures/contracts/Exchange.sol
@@ -1,6 +1,6 @@
/*
- Copyright 2017 ZeroEx Intl.
+ Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol b/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol
index 1ba8a96de..44570d459 100644
--- a/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol
+++ b/packages/deployer/test/fixtures/contracts/TokenTransferProxy.sol
@@ -1,6 +1,6 @@
/*
- Copyright 2017 ZeroEx Intl.
+ Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.