diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-03-16 18:09:12 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-03-21 22:11:41 +0800 |
commit | 439e8640859cf790bac51c1beeec4cf65aa33c57 (patch) | |
tree | 9863b39ce23369c97145ee5308545b2b8040a6cf /packages/deployer/src | |
parent | f45191d0e81e3ad3873e78c3891fdd5f9e9fd55c (diff) | |
download | dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.tar dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.tar.gz dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.tar.bz2 dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.tar.lz dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.tar.xz dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.tar.zst dexon-sol-tools-439e8640859cf790bac51c1beeec4cf65aa33c57.zip |
Change the type of optimizerEnabled to boolean and convert it to number only before passing to a compiler
Diffstat (limited to 'packages/deployer/src')
-rw-r--r-- | packages/deployer/src/cli.ts | 4 | ||||
-rw-r--r-- | packages/deployer/src/compiler.ts | 4 | ||||
-rw-r--r-- | packages/deployer/src/utils/types.ts | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/deployer/src/cli.ts b/packages/deployer/src/cli.ts index 176eaf973..efbf56bb0 100644 --- a/packages/deployer/src/cli.ts +++ b/packages/deployer/src/cli.ts @@ -29,7 +29,7 @@ async function onCompileCommandAsync(argv: CliOptions): Promise<void> { const opts: CompilerOptions = { contractsDir: argv.contractsDir, networkId: argv.networkId, - optimizerEnabled: argv.shouldOptimize ? 1 : 0, + optimizerEnabled: argv.shouldOptimize, artifactsDir: argv.artifactsDir, specifiedContracts: getContractsSetFromList(argv.contracts), }; @@ -47,7 +47,7 @@ async function onDeployCommandAsync(argv: CliOptions): Promise<void> { const compilerOpts: CompilerOptions = { contractsDir: argv.contractsDir, networkId, - optimizerEnabled: argv.shouldOptimize ? 1 : 0, + optimizerEnabled: argv.shouldOptimize, artifactsDir: argv.artifactsDir, specifiedContracts: getContractsSetFromList(argv.contracts), }; diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 942777458..28232a661 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -32,7 +32,7 @@ const DEPENDENCY_PATH_REGEX = /"([^"]+)"/; // Source: https://github.com/BlockCh export class Compiler { private _contractsDir: string; private _networkId: number; - private _optimizerEnabled: number; + private _optimizerEnabled: boolean; private _artifactsDir: string; private _contractSources?: ContractSources; private _solcErrors: Set<string> = new Set(); @@ -223,7 +223,7 @@ export class Compiler { }; const compiled = solcInstance.compile( sourcesToCompile, - this._optimizerEnabled, + Number(this._optimizerEnabled), this._findImportsIfSourcesExist.bind(this), ); diff --git a/packages/deployer/src/utils/types.ts b/packages/deployer/src/utils/types.ts index f33f8f66a..13b24b9b7 100644 --- a/packages/deployer/src/utils/types.ts +++ b/packages/deployer/src/utils/types.ts @@ -20,7 +20,7 @@ export interface ContractNetworks { export interface ContractNetworkData { solc_version: string; - optimizer_enabled: number; + optimizer_enabled: boolean; keccak256: string; source_tree_hash: string; abi: Web3.ContractAbi; @@ -53,7 +53,7 @@ export interface CliOptions extends yargs.Arguments { export interface CompilerOptions { contractsDir: string; networkId: number; - optimizerEnabled: number; + optimizerEnabled: boolean; artifactsDir: string; specifiedContracts: Set<string>; } |