From 9e81d3c87b693e10dc9de894da6eb8651b7ed547 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 2 Apr 2018 12:22:19 +0300 Subject: Fix contracts and artifacts paths --- packages/metacoin/package.json | 3 ++- packages/metacoin/test/utils/config.ts | 6 ++++-- yarn.lock | 10 ---------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 966c561c6..24194b6c4 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -7,7 +7,8 @@ "build:watch": "tsc -w", "lint": "tslint --project .", "clean": "shx rm -rf lib", - "prebuild": "run-s clean generate_contract_wrappers", + "prebuild": "run-s clean generate_contract_wrappers copy_artifacts", + "copy_artifacts": "copyfiles './artifacts/**/*' './contracts/**/*' ./lib", "build": "tsc", "test": "run-s build run_mocha", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/packages/metacoin/test/utils/config.ts b/packages/metacoin/test/utils/config.ts index 1b78cce2e..d3a830754 100644 --- a/packages/metacoin/test/utils/config.ts +++ b/packages/metacoin/test/utils/config.ts @@ -1,7 +1,9 @@ +import * as path from 'path'; + export const config = { networkId: 50, - artifactsDir: 'artifacts', - contractsDir: 'contracts', + artifactsDir: path.resolve(__dirname, '../../artifacts'), + contractsDir: path.resolve(__dirname, '../../contracts'), ganacheLogFile: 'ganache.log', mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', }; diff --git a/yarn.lock b/yarn.lock index 65e317f61..9fe1dbf62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1777,10 +1777,6 @@ bn.js@4.11.6: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" -bn.js@4.11.7: - version "4.11.7" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46" - bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.3, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.4.0, bn.js@^4.8.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -11680,12 +11676,6 @@ typedoc@~0.8.0: typedoc-default-themes "^0.5.0" typescript "2.4.1" -types-bn@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/types-bn/-/types-bn-0.0.1.tgz#4253c7c7251b14e1d77cdca6f58800e5e2b82c4b" - dependencies: - bn.js "4.11.7" - typescript@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc" -- cgit v1.2.3