From 3eb40db498ab8e7a0a7dfc9f67299989288b4ea1 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 31 Jan 2018 10:07:54 +0100 Subject: Move all contracts into a single directory --- packages/deployer/src/compiler.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/deployer') diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 63db6c865..67c46989a 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -181,6 +181,7 @@ export class Compiler { ); if (!_.isUndefined(compiled.errors)) { + utils.consoleLog(compiled.errors); _.each(compiled.errors, errMsg => { const normalizedErrMsg = Compiler._getNormalizedErrMsg(errMsg); this._solcErrors.add(normalizedErrMsg); -- cgit v1.2.3 From bb4c8bf8eb8c347900980d92534b19a3a80c690b Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 1 Feb 2018 10:21:44 -0800 Subject: Rename previous contracts, fix imports, add nested file structure --- packages/deployer/src/compiler.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/deployer') diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 67c46989a..63db6c865 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -181,7 +181,6 @@ export class Compiler { ); if (!_.isUndefined(compiled.errors)) { - utils.consoleLog(compiled.errors); _.each(compiled.errors, errMsg => { const normalizedErrMsg = Compiler._getNormalizedErrMsg(errMsg); this._solcErrors.add(normalizedErrMsg); -- cgit v1.2.3 From d5d6079b673d0a6d311f349dba291da18c846d9e Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 1 Feb 2018 15:48:06 -0800 Subject: Rename directories --- packages/deployer/src/cli.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/deployer') diff --git a/packages/deployer/src/cli.ts b/packages/deployer/src/cli.ts index decb37fdc..0fe412bdf 100644 --- a/packages/deployer/src/cli.ts +++ b/packages/deployer/src/cli.ts @@ -9,8 +9,8 @@ import { commands } from './commands'; import { CliOptions, CompilerOptions, DeployerOptions } from './utils/types'; const DEFAULT_OPTIMIZER_ENABLED = false; -const DEFAULT_CONTRACTS_DIR = path.resolve('contracts'); -const DEFAULT_ARTIFACTS_DIR = `${path.resolve('build')}/artifacts/`; +const DEFAULT_CONTRACTS_DIR = path.resolve('src'); +const DEFAULT_ARTIFACTS_DIR = path.resolve('artifacts'); const DEFAULT_NETWORK_ID = 50; const DEFAULT_JSONRPC_PORT = 8545; const DEFAULT_GAS_PRICE = (10 ** 9 * 2).toString(); -- cgit v1.2.3