Fix bugs: unsuccessful compillation

NomicFoundation · Jun 12, 2019 · 1b4b65c · 1b4b65c
1 parent 42b09e0
commit 1b4b65c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,5 @@
     "lint": "lerna exec -- npm run lint",
     "lint:fix": "lerna exec -- npm run lint:fix"
   },
-  "dependencies": {
-    "@types/deep-equal": "^1.0.1"
-  }
+  "dependencies": {}
 }
diff --git a/packages/buidler-core/package-lock.json b/packages/buidler-core/package-lock.json
diff --git a/packages/buidler-core/package.json b/packages/buidler-core/package.json
@@ -62,7 +62,6 @@
   },
   "dependencies": {
     "ansi-colors": "^3.2.4",
-    "deep-equal": "^1.0.1",
     "deepmerge": "^2.1.0",
     "download": "^7.1.0",
     "enquirer": "^2.3.0",

diff --git a/packages/buidler-core/src/builtin-tasks/compile.ts b/packages/buidler-core/src/builtin-tasks/compile.ts
@@ -27,7 +27,7 @@ import {
   TASK_COMPILE_GET_SOURCE_PATHS,
   TASK_COMPILE_RUN_COMPILER
 } from "./task-names";
-import { areArtifactsCached } from "./utils/cache";
+import { areArtifactsCached, cacheBuidlerConfig } from "./utils/cache";
 
 export default function() {
   internalTask(TASK_COMPILE_GET_SOURCE_PATHS, async (_, { config }) => {
@@ -108,6 +108,8 @@ export default function() {
       throw new BuidlerError(ERRORS.BUILTIN_TASKS.COMPILE_FAILURE);
     }
 
+    await cacheBuidlerConfig(config.paths, config.solc);
+
     return output;
   });
 
@@ -124,7 +126,7 @@ export default function() {
       .getResolvedFiles()
       .map(file => file.lastModificationDate.getTime());
 
-    return areArtifactsCached(sourceTimestamps, config.paths);
+    return areArtifactsCached(sourceTimestamps, config.solc, config.paths);
   });
 
   internalTask(TASK_BUILD_ARTIFACTS, async ({ force }, { config, run }) => {

diff --git a/packages/buidler-core/src/builtin-tasks/utils/cache.ts b/packages/buidler-core/src/builtin-tasks/utils/cache.ts
@@ -1,5 +1,5 @@
-import deepEqual from "deep-equal";
 import fsExtra from "fs-extra";
+import isEqual from "lodash/isEqual";
 import path from "path";
 
 import { glob } from "../../internal/util/glob";
@@ -10,12 +10,11 @@ import { ProjectPaths, SolcConfig } from "../../types";
 // Furthermore, cache is invalidated if Buidler's version changes, or a different solc version is set in the buidler config.
 export async function areArtifactsCached(
   sourceTimestamps: number[],
+  newSolcConfig: SolcConfig,
   paths: ProjectPaths
 ): Promise<boolean> {
   const oldConfig = await getLastUsedConfig(paths.cache);
 
-  const newSolcConfig = await getSolcConfig(paths.configFile);
-
   if (
     oldConfig === undefined ||
     !compareSolcConfigs({
@@ -24,7 +23,6 @@ export async function areArtifactsCached(
     }) ||
     !(await compareBuidlerVersion(oldConfig.buidlerVersion))
   ) {
-    await saveLastConfigUsed(paths, newSolcConfig);
     return false;
   }
 
@@ -73,7 +71,10 @@ async function getLastUsedConfig(
   return module.require(pathToConfig);
 }
 
-async function saveLastConfigUsed(paths: ProjectPaths, config: SolcConfig) {
+export async function cacheBuidlerConfig(
+  paths: ProjectPaths,
+  config: SolcConfig
+) {
   const pathToLastConfigUsed = getPathToCachedLastConfigPath(paths.cache);
   const newJson = {
     solc: config,
@@ -92,7 +93,6 @@ async function saveLastConfigUsed(paths: ProjectPaths, config: SolcConfig) {
 async function getSolcConfig(configPath: string): Promise<SolcConfig> {
   const solcConfig: SolcConfig = (await module.require(configPath)).solc;
 
-  console.log({ solcConfig });
   return solcConfig;
 }
 
@@ -103,7 +103,7 @@ function compareSolcConfigs({
   oldConfig: SolcConfig;
   newConfig: SolcConfig;
 }): boolean {
-  return deepEqual(oldConfig, newConfig, { strict: true });
+  return isEqual(oldConfig, newConfig);
 }
 
 async function getCurrentBuidlerVersion(): Promise<string> {