From 62f45f7b41fdd984025ba70008c682eeded2fadb Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Mar 2018 14:36:19 +0100 Subject: Cache code parsing --- packages/sol-cov/src/instrument_solidity.ts | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'packages/sol-cov/src/instrument_solidity.ts') diff --git a/packages/sol-cov/src/instrument_solidity.ts b/packages/sol-cov/src/instrument_solidity.ts index ac58270cb..163e3c7b9 100644 --- a/packages/sol-cov/src/instrument_solidity.ts +++ b/packages/sol-cov/src/instrument_solidity.ts @@ -1,3 +1,4 @@ +import * as ethUtil from 'ethereumjs-util'; import * as fs from 'fs'; import * as _ from 'lodash'; import * as path from 'path'; @@ -6,11 +7,19 @@ import * as SolidityParser from 'solidity-parser-sc'; import { ASTVisitor, CoverageEntriesDescription } from './ast_visitor'; import { getLocationByOffset } from './source_maps'; +// Parsing source code for each transaction/code is slow and therefore we cache it +const coverageEntriesBySourceHash: { [sourceHash: string]: CoverageEntriesDescription } = {}; + export const collectCoverageEntries = (contractSource: string, fileName: string) => { - const ast = SolidityParser.parse(contractSource); - const locationByOffset = getLocationByOffset(contractSource); - const astVisitor = new ASTVisitor(locationByOffset); - astVisitor.walkAST(ast); - const coverageEntries = astVisitor.getCollectedCoverageEntries(); - return coverageEntries; + const time = Date.now(); + const sourceHash = ethUtil.sha3(contractSource).toString('hex'); + if (_.isUndefined(coverageEntriesBySourceHash[sourceHash])) { + const ast = SolidityParser.parse(contractSource); + const locationByOffset = getLocationByOffset(contractSource); + const astVisitor = new ASTVisitor(locationByOffset); + astVisitor.walkAST(ast); + coverageEntriesBySourceHash[sourceHash] = astVisitor.getCollectedCoverageEntries(); + } + const coverageEntriesDescription = coverageEntriesBySourceHash[sourceHash]; + return coverageEntriesDescription; }; -- cgit v1.2.3