From 8b52793f2fa21bcb23a3c38b6d3773cfc20186fd Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 16 Mar 2018 16:34:02 +0100
Subject: Add tests for compiler utils

---
 packages/deployer/src/globals.d.ts        | 2 ++
 packages/deployer/src/utils/compiler.ts   | 5 +----
 packages/deployer/src/utils/fs_wrapper.ts | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages/deployer/src')

diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts
index 3cff8a909..83db346f9 100644
--- a/packages/deployer/src/globals.d.ts
+++ b/packages/deployer/src/globals.d.ts
@@ -1,3 +1,5 @@
+declare module 'dirty-chai';
+
 // tslint:disable:completed-docs
 declare module 'solc' {
     import * as Web3 from 'web3';
diff --git a/packages/deployer/src/utils/compiler.ts b/packages/deployer/src/utils/compiler.ts
index 3fb35e9ed..1d21d7d31 100644
--- a/packages/deployer/src/utils/compiler.ts
+++ b/packages/deployer/src/utils/compiler.ts
@@ -48,7 +48,7 @@ export async function createArtifactsDirIfDoesNotExistAsync(artifactsDir: string
  * @return Solc compiler version range.
  */
 export function parseSolidityVersionRange(source: string): string {
-    const SOLIDITY_VERSION_RANGE_REGEX = /pragma solidity (.*);/;
+    const SOLIDITY_VERSION_RANGE_REGEX = /pragma\s+solidity\s+(.*);/;
     const solcVersionRangeMatch = source.match(SOLIDITY_VERSION_RANGE_REGEX);
     if (_.isNull(solcVersionRangeMatch)) {
         throw new Error('Could not find Solidity version range in source');
@@ -104,9 +104,6 @@ export function parseDependencies(source: string): string[] {
  */
 export function findImportIfExist(contractSources: ContractSources, importPath: string): solc.ImportContents {
     const fileName = path.basename(importPath);
-    if (_.isUndefined(contractSources)) {
-        throw new Error('Contract sources not yet initialized');
-    }
     const source = contractSources[fileName];
     if (_.isUndefined(source)) {
         throw new Error(`Contract source not found for ${fileName}`);
diff --git a/packages/deployer/src/utils/fs_wrapper.ts b/packages/deployer/src/utils/fs_wrapper.ts
index 34c7caa0e..e02c83f27 100644
--- a/packages/deployer/src/utils/fs_wrapper.ts
+++ b/packages/deployer/src/utils/fs_wrapper.ts
@@ -7,5 +7,6 @@ export const fsWrapper = {
     writeFileAsync: promisify<undefined>(fs.writeFile),
     mkdirAsync: promisify<undefined>(fs.mkdir),
     doesPathExistSync: fs.existsSync,
+    rmdirSync: fs.rmdirSync,
     removeFileAsync: promisify<undefined>(fs.unlink),
 };
-- 
cgit v1.2.3