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

change some *Sync to *Async

Browse Source
This commit is contained in:
F. Eugene Aumson 2018-08-16 13:59:46 -07:00
parent 85427a84df
commit 402ca27fbf
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,18 @@ export class Compiler {
private readonly _artifactsDir: string; private readonly _artifactsDir: string;
private readonly _solcVersionIfExists: string | undefined; private readonly _solcVersionIfExists: string | undefined;
private readonly _specifiedContracts: string[] | TYPE_ALL_FILES_IDENTIFIER; private readonly _specifiedContracts: string[] | TYPE_ALL_FILES_IDENTIFIER;
private static async _doesFileExistAsync(filePath: string): Promise<boolean> {
try {
await fsWrapper.accessAsync(
filePath,
// node says we need to use bitwise, but tslint says no:
fs.constants.F_OK | fs.constants.R_OK, // tslint:disable-line:no-bitwise
);
} catch (err) {
return false;
}
return true;
}
private static async _getSolcAsync( private static async _getSolcAsync(
solcVersion: string, solcVersion: string,
): Promise<{ solcInstance: solc.SolcInstance; fullSolcVersion: string }> { ): Promise<{ solcInstance: solc.SolcInstance; fullSolcVersion: string }> {
@ -91,9 +103,8 @@ export class Compiler {
} }
const compilerBinFilename = path.join(SOLC_BIN_DIR, fullSolcVersion); const compilerBinFilename = path.join(SOLC_BIN_DIR, fullSolcVersion);
let solcjs: string; let solcjs: string;
const isCompilerAvailableLocally = fs.existsSync(compilerBinFilename); if (await Compiler._doesFileExistAsync(compilerBinFilename)) {
if (isCompilerAvailableLocally) { solcjs = (await fsWrapper.readFileAsync(compilerBinFilename)).toString();
solcjs = fs.readFileSync(compilerBinFilename).toString();
} else { } else {
logUtils.log(`Downloading ${fullSolcVersion}...`); logUtils.log(`Downloading ${fullSolcVersion}...`);
const url = `${constants.BASE_COMPILER_URL}${fullSolcVersion}`; const url = `${constants.BASE_COMPILER_URL}${fullSolcVersion}`;
@ -103,7 +114,10 @@ export class Compiler {
throw new Error(`Failed to load ${fullSolcVersion}`); throw new Error(`Failed to load ${fullSolcVersion}`);
} }
solcjs = await response.text(); solcjs = await response.text();
fs.writeFileSync(compilerBinFilename, solcjs); await fsWrapper.writeFileAsync(compilerBinFilename, solcjs);
}
if (solcjs.length === 0) {
throw new Error('No compiler available');
} }
const solcInstance = solc.setupMethods(requireFromString(solcjs, compilerBinFilename)); const solcInstance = solc.setupMethods(requireFromString(solcjs, compilerBinFilename));
return { solcInstance, fullSolcVersion }; return { solcInstance, fullSolcVersion };

1
packages/sol-compiler/src/utils/fs_wrapper.ts
View File

@ -12,4 +12,5 @@ export const fsWrapper = {
removeFileAsync: promisify<undefined>(fs.unlink), removeFileAsync: promisify<undefined>(fs.unlink),
statAsync: promisify<fs.Stats>(fs.stat), statAsync: promisify<fs.Stats>(fs.stat),
appendFileAsync: promisify<undefined>(fs.appendFile), appendFileAsync: promisify<undefined>(fs.appendFile),
accessAsync: promisify<boolean>(fs.access),
}; };