diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-13 19:27:52 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-13 19:27:52 +0800 |
commit | e5cf41b3134d6cd5fdda995aa81ec23e51bb5145 (patch) | |
tree | 73d324f54d680285be856c5d42b5ea346a40cc81 /packages/deployer/src/compiler.ts | |
parent | 74012ad584ba93043e60f143d88619f580ceed08 (diff) | |
download | dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.tar dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.tar.gz dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.tar.bz2 dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.tar.lz dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.tar.xz dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.tar.zst dexon-sol-tools-e5cf41b3134d6cd5fdda995aa81ec23e51bb5145.zip |
Uncomment tests
Diffstat (limited to 'packages/deployer/src/compiler.ts')
-rw-r--r-- | packages/deployer/src/compiler.ts | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 0a99e5659..dfbe469a7 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -102,7 +102,7 @@ export class Compiler { private async _compileContractAsync(contractName: string): Promise<void> { const contractSource = this._resolver.resolve(contractName); const currentArtifactIfExists = await getContractArtifactIfExistsAsync(this._artifactsDir, contractName); - const sourceTreeHash = `0x${this._getSourceTreeHash(contractSource.path).toString('hex')}`; + const sourceTreeHashHex = `0x${this._getSourceTreeHash(contractSource.path).toString('hex')}`; let shouldCompile = false; if (_.isUndefined(currentArtifactIfExists)) { @@ -111,7 +111,7 @@ export class Compiler { const currentArtifact = currentArtifactIfExists as ContractArtifact; shouldCompile = currentArtifact.networks[this._networkId].optimizer_enabled !== this._optimizerEnabled || - currentArtifact.networks[this._networkId].source_tree_hash !== sourceTreeHash; + currentArtifact.networks[this._networkId].source_tree_hash !== sourceTreeHashHex; } if (!shouldCompile) { return; @@ -138,9 +138,6 @@ export class Compiler { const solcInstance = solc.setupMethods(requireFromString(solcjs, compilerBinFilename)); logUtils.log(`Compiling ${contractName} with Solidity v${solcVersion}...`); - if (_.isUndefined(contractSource)) { - throw new Error(`Failed to resolve ${contractName}`); - } const source = contractSource.source; const absoluteFilePath = contractSource.path; const standardInput: solc.StandardInput = { @@ -210,7 +207,7 @@ export class Compiler { const updated_at = Date.now(); const contractNetworkData: ContractNetworkData = { solc_version: solcVersion, - source_tree_hash: sourceTreeHash, + source_tree_hash: sourceTreeHashHex, optimizer_enabled: this._optimizerEnabled, abi, bytecode, |