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

Only look at *.sol files in NameResolver

Browse Source
This commit is contained in:
Leonid Logvinov
2018-05-14 18:34:37 +02:00
parent 842f2ea5cc
commit 60b1fdd367
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/sol-resolver/src/resolvers/name_resolver.ts
View File

@@ -6,6 +6,8 @@ import { ContractSource } from '../types';
import { EnumerableResolver } from './enumerable_resolver'; import { EnumerableResolver } from './enumerable_resolver';
const SOLIDITY_FILE_EXTENSION = '.sol';
export class NameResolver extends EnumerableResolver { export class NameResolver extends EnumerableResolver {
private _contractsDir: string; private _contractsDir: string;
constructor(contractsDir: string) { constructor(contractsDir: string) {
@@ -13,7 +15,6 @@ export class NameResolver extends EnumerableResolver {
this._contractsDir = contractsDir; this._contractsDir = contractsDir;
} }
public resolveIfExists(lookupContractName: string): ContractSource | undefined { public resolveIfExists(lookupContractName: string): ContractSource | undefined {
const SOLIDITY_FILE_EXTENSION = '.sol';
let contractSource: ContractSource | undefined; let contractSource: ContractSource | undefined;
const onFile = (filePath: string) => { const onFile = (filePath: string) => {
const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION); const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION);
@@ -32,7 +33,6 @@ export class NameResolver extends EnumerableResolver {
return contractSource; return contractSource;
} }
public getAll(): ContractSource[] { public getAll(): ContractSource[] {
const SOLIDITY_FILE_EXTENSION = '.sol';
const contractSources: ContractSource[] = []; const contractSources: ContractSource[] = [];
const onFile = (filePath: string) => { const onFile = (filePath: string) => {
const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION); const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION);
@@ -56,6 +56,9 @@ export class NameResolver extends EnumerableResolver {
throw new Error(`No directory found at ${dirPath}`); throw new Error(`No directory found at ${dirPath}`);
} }
for (const fileName of dirContents) { for (const fileName of dirContents) {
if (!fileName.endsWith(SOLIDITY_FILE_EXTENSION)) {
continue;
}
const absoluteEntryPath = path.join(dirPath, fileName); const absoluteEntryPath = path.join(dirPath, fileName);
const isDirectory = fs.lstatSync(absoluteEntryPath).isDirectory(); const isDirectory = fs.lstatSync(absoluteEntryPath).isDirectory();
const entryPath = path.relative(this._contractsDir, absoluteEntryPath); const entryPath = path.relative(this._contractsDir, absoluteEntryPath);