crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract method _shouldCompile()

Browse Source
This commit is contained in:
F. Eugene Aumson 2018-08-15 16:14:36 -07:00
parent 89202b7bdf
commit badcb35525
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/sol-compiler/src/compiler.ts
View File

@ -172,19 +172,7 @@ export class Compiler {
path.join(this._contractsDir, contractSource.path),
).toString('hex')}`,
};
let shouldCompile = false;
if (_.isUndefined(contractPathToData[contractSource.path].currentArtifactIfExists)) {
shouldCompile = true;
} else {
const currentArtifact = contractPathToData[contractSource.path]
.currentArtifactIfExists as ContractArtifact;
const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION;
const didCompilerSettingsChange = !_.isEqual(currentArtifact.compiler.settings, this._compilerSettings);
const didSourceChange =
currentArtifact.sourceTreeHashHex !== contractPathToData[contractSource.path].sourceTreeHashHex;
shouldCompile = !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange;
}
if (!shouldCompile) {
if (!this._shouldCompile(contractPathToData[contractSource.path])) {
continue;
}
const solcVersion = _.isUndefined(this._solcVersionIfExists)
@ -231,6 +219,17 @@ export class Compiler {
}
}
}
private _shouldCompile(contractData: ContractData): boolean {
if (_.isUndefined(contractData.currentArtifactIfExists)) {
return true;
} else {
const currentArtifact = contractData.currentArtifactIfExists as ContractArtifact;
const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION;
const didCompilerSettingsChange = !_.isEqual(currentArtifact.compiler.settings, this._compilerSettings);
const didSourceChange = currentArtifact.sourceTreeHashHex !== contractData.sourceTreeHashHex;
return !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange;
}
}
private async _verifyAndPersistCompiledContractAsync(
contractPath: string,
contractMetadata: ContractData,