aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-05-07 20:32:17 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-05-07 20:32:17 +0800
commit906af858a5b013927e06ebafdad12d13ba674932 (patch)
tree3d86a42696ffb26c361d46dd54b6c3bce296ed09
parentb699a61f563b6dbffa8c7f05802be9314d7a967b (diff)
downloaddexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.tar
dexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.tar.gz
dexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.tar.bz2
dexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.tar.lz
dexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.tar.xz
dexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.tar.zst
dexon-sol-tools-906af858a5b013927e06ebafdad12d13ba674932.zip
Fix artifacts paths
-rw-r--r--.gitignore2
-rw-r--r--.prettierignore2
-rw-r--r--packages/contracts/package.json4
-rw-r--r--packages/dev-utils/src/coverage.ts2
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 83538fdca..7fed1959e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,7 @@ bin/
packages/sol-cov/test/fixtures/artifacts
packages/metacoin/artifacts
packages/0x.js/test/artifacts
-packages/migrations/src/artifacts
+packages/migrations/artifacts/1.0.0
# generated contract wrappers
packages/0x.js/src/contract_wrappers/generated/
diff --git a/.prettierignore b/.prettierignore
index 024d0b548..f12fdf870 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,6 +2,6 @@ lib
.nyc_output
/packages/contracts/src/artifacts
/packages/metacoin/artifacts
-/packages/migrations/src/artifacts
+/packages/migrations/artifacts/1.0.0
package.json
scripts/postpublish_utils.js
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 4ca4e2db1..c47518f17 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -10,7 +10,7 @@
"scripts": {
"build:watch": "tsc -w",
"prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers",
- "copy_artifacts": "copyfiles -u 4 '../migrations/src/artifacts/**/*' ./lib/src/artifacts;",
+ "copy_artifacts": "copyfiles -u 4 '../migrations/artifacts/1.0.0/**/*' ./lib/src/artifacts;",
"build": "tsc",
"test": "run-s build run_mocha",
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
@@ -26,7 +26,7 @@
"test:circleci": "yarn test:coverage"
},
"config": {
- "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json"
+ "abis": "../migrations/artifacts/1.0.0/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json"
},
"repository": {
"type": "git",
diff --git a/packages/dev-utils/src/coverage.ts b/packages/dev-utils/src/coverage.ts
index 67c87ec30..743573874 100644
--- a/packages/dev-utils/src/coverage.ts
+++ b/packages/dev-utils/src/coverage.ts
@@ -13,7 +13,7 @@ export const coverage = {
return coverageSubprovider;
},
_getCoverageSubprovider(): CoverageSubprovider {
- const artifactsPath = '../migrations/src/artifacts';
+ const artifactsPath = '../migrations/artifacts/1.0.0';
const contractsPath = 'src/contracts';
const networkId = 50;
const defaultFromAddress = constants.TESTRPC_FIRST_ADDRESS;