diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-19 04:22:39 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-07 16:23:08 +0800 |
commit | 72b2a1c66fa9fb85ea8515645b97332eee204550 (patch) | |
tree | 8a4504ea2fdbc554f5b62f2b46088bea3e5b6324 /packages/sol-resolver/src/resolvers/name_resolver.ts | |
parent | 69a6166b6a1d39afc24b8dd950ec5d8539a03420 (diff) | |
download | dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.tar dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.tar.gz dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.tar.bz2 dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.tar.lz dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.tar.xz dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.tar.zst dexon-sol-tools-72b2a1c66fa9fb85ea8515645b97332eee204550.zip |
Implement new artifacts format
Diffstat (limited to 'packages/sol-resolver/src/resolvers/name_resolver.ts')
-rw-r--r-- | packages/sol-resolver/src/resolvers/name_resolver.ts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/sol-resolver/src/resolvers/name_resolver.ts b/packages/sol-resolver/src/resolvers/name_resolver.ts index 6849b7610..a0bedab98 100644 --- a/packages/sol-resolver/src/resolvers/name_resolver.ts +++ b/packages/sol-resolver/src/resolvers/name_resolver.ts @@ -18,7 +18,7 @@ export class NameResolver extends EnumerableResolver { const onFile = (filePath: string) => { const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION); if (contractName === lookupContractName) { - const source = fs.readFileSync(filePath).toString(); + const source = fs.readFileSync(path.join(this._contractsDir, filePath)).toString(); contractSource = { source, path: filePath, @@ -35,7 +35,7 @@ export class NameResolver extends EnumerableResolver { const contractSources: ContractSource[] = []; const onFile = (filePath: string) => { const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION); - const source = fs.readFileSync(filePath).toString(); + const source = fs.readFileSync(path.join(this._contractsDir, filePath)).toString(); const contractSource = { source, path: filePath, @@ -54,9 +54,10 @@ export class NameResolver extends EnumerableResolver { throw new Error(`No directory found at ${dirPath}`); } for (const fileName of dirContents) { - const entryPath = path.join(dirPath, fileName); - const isDirectory = fs.lstatSync(entryPath).isDirectory(); - const isComplete = isDirectory ? this._traverseContractsDir(entryPath, onFile) : onFile(entryPath); + const absoluteEntryPath = path.join(dirPath, fileName); + const isDirectory = fs.lstatSync(absoluteEntryPath).isDirectory(); + const entryPath = path.relative(this._contractsDir, absoluteEntryPath); + const isComplete = isDirectory ? this._traverseContractsDir(absoluteEntryPath, onFile) : onFile(entryPath); if (isComplete) { return isComplete; } |