diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-02-16 02:20:03 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-02-16 02:20:03 +0800 |
commit | 060b02eaed2c7e2946286897b79ccfe828efc95d (patch) | |
tree | 09c7e9fab9f1120e1aec28c2d0ad8d00a8aa9671 /packages/deployer | |
parent | 003e5da00df49bc192112e7368e4478731fea82f (diff) | |
download | dexon-0x-contracts-060b02eaed2c7e2946286897b79ccfe828efc95d.tar.gz dexon-0x-contracts-060b02eaed2c7e2946286897b79ccfe828efc95d.tar.zst dexon-0x-contracts-060b02eaed2c7e2946286897b79ccfe828efc95d.zip |
Rename variables
Diffstat (limited to 'packages/deployer')
-rw-r--r-- | packages/deployer/src/cli.ts | 18 | ||||
-rw-r--r-- | packages/deployer/src/compiler.ts | 6 | ||||
-rw-r--r-- | packages/deployer/src/utils/types.ts | 2 | ||||
-rw-r--r-- | packages/deployer/test/deploy_test.ts | 2 | ||||
-rw-r--r-- | packages/deployer/test/util/constants.ts | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/packages/deployer/src/cli.ts b/packages/deployer/src/cli.ts index bc1ec8421..3c6d042c0 100644 --- a/packages/deployer/src/cli.ts +++ b/packages/deployer/src/cli.ts @@ -14,7 +14,7 @@ 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(); -const DEFAULT_COMPILE_CONTRACTS = '*'; +const DEFAULT_CONTRACTS_LIST = '*'; /** * Compiles all contracts with options passed in through CLI. @@ -26,7 +26,7 @@ async function onCompileCommand(argv: CliOptions): Promise<void> { networkId: argv.networkId, optimizerEnabled: argv.shouldOptimize ? 1 : 0, artifactsDir: argv.artifactsDir, - contractsToCompile: generateContractsToCompileSet(argv.contracts), + specifiedContracts: getContractsSetFromList(argv.contracts), }; await commands.compileAsync(opts); } @@ -45,7 +45,7 @@ async function onMigrateCommand(argv: CliOptions): Promise<void> { networkId, optimizerEnabled: argv.shouldOptimize ? 1 : 0, artifactsDir: argv.artifactsDir, - contractsToCompile: generateContractsToCompileSet(argv.contracts), + specifiedContracts: getContractsSetFromList(argv.contracts), }; await commands.compileAsync(compilerOpts); @@ -75,7 +75,7 @@ async function onDeployCommand(argv: CliOptions): Promise<void> { networkId, optimizerEnabled: argv.shouldOptimize ? 1 : 0, artifactsDir: argv.artifactsDir, - contractsToCompile: generateContractsToCompileSet(argv.contracts), + specifiedContracts: getContractsSetFromList(argv.contracts), }; await commands.compileAsync(compilerOpts); @@ -97,13 +97,13 @@ async function onDeployCommand(argv: CliOptions): Promise<void> { * Creates a set of contracts to compile. * @param contracts Comma separated list of contracts to compile */ -function generateContractsToCompileSet(contracts: string): Set<string> { - const contractsToCompile = new Set(); +function getContractsSetFromList(contracts: string): Set<string> { + const specifiedContracts = new Set(); const contractsArray = contracts.split(','); _.forEach(contractsArray, contractName => { - contractsToCompile.add(contractName); + specifiedContracts.add(contractName); }); - return contractsToCompile; + return specifiedContracts; } /** * Provides extra required options for deploy command. @@ -162,7 +162,7 @@ function deployCommandBuilder(yargsInstance: any) { }) .option('contracts', { type: 'string', - default: DEFAULT_COMPILE_CONTRACTS, + default: DEFAULT_CONTRACTS_LIST, description: 'comma separated list of contracts to compile', }) .command('compile', 'compile contracts', identityCommandBuilder, onCompileCommand) diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 3ff41139e..2b0b81c44 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -26,7 +26,7 @@ export class Compiler { private _artifactsDir: string; private _contractSourcesIfExists?: ContractSources; private _solcErrors: Set<string>; - private _contractsToCompile: Set<string>; + private _specifiedContracts: Set<string>; /** * Recursively retrieves Solidity source code from directory. * @param dirPath Directory to search. @@ -108,7 +108,7 @@ export class Compiler { this._optimizerEnabled = opts.optimizerEnabled; this._artifactsDir = opts.artifactsDir; this._solcErrors = new Set(); - this._contractsToCompile = opts.contractsToCompile; + this._specifiedContracts = opts.specifiedContracts; } /** * Compiles all Solidity files found in contractsDir and writes JSON artifacts to artifactsDir. @@ -140,7 +140,7 @@ export class Compiler { const currentArtifactPath = `${this._artifactsDir}/${contractName}.json`; const sourceHash = `0x${ethUtil.sha3(source).toString('hex')}`; const isContractSpecified = - this._contractsToCompile.has(ALL_CONTRACTS_IDENTIFIER) || this._contractsToCompile.has(contractName); + this._specifiedContracts.has(ALL_CONTRACTS_IDENTIFIER) || this._specifiedContracts.has(contractName); let currentArtifactString: string; let currentArtifact: ContractArtifact; diff --git a/packages/deployer/src/utils/types.ts b/packages/deployer/src/utils/types.ts index c8bb1b9ca..46481828e 100644 --- a/packages/deployer/src/utils/types.ts +++ b/packages/deployer/src/utils/types.ts @@ -50,7 +50,7 @@ export interface CompilerOptions { networkId: number; optimizerEnabled: number; artifactsDir: string; - contractsToCompile: Set<string>; + specifiedContracts: Set<string>; } export interface DeployerOptions { diff --git a/packages/deployer/test/deploy_test.ts b/packages/deployer/test/deploy_test.ts index 775a40cf6..6a8397982 100644 --- a/packages/deployer/test/deploy_test.ts +++ b/packages/deployer/test/deploy_test.ts @@ -18,7 +18,7 @@ const compilerOpts: CompilerOptions = { contractsDir, networkId: constants.networkId, optimizerEnabled: constants.optimizerEnabled, - contractsToCompile: new Set(constants.contractsToCompile), + specifiedContracts: new Set(constants.specifiedContracts), }; const compiler = new Compiler(compilerOpts); const deployerOpts = { diff --git a/packages/deployer/test/util/constants.ts b/packages/deployer/test/util/constants.ts index 223bfed27..adb13f330 100644 --- a/packages/deployer/test/util/constants.ts +++ b/packages/deployer/test/util/constants.ts @@ -8,5 +8,5 @@ export const constants = { timeoutMs: 20000, zrxTokenAddress: '0xe41d2489571d322189246dafa5ebde1f4699f498', tokenTransferProxyAddress: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4', - contractsToCompile: '*', + specifiedContracts: '*', }; |