fix CI

embarklabs · Feb 11, 2020 · c08b658 · c08b658
1 parent 0b795b8
commit c08b658
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/packages/core/core/src/config.ts b/packages/core/core/src/config.ts
@@ -27,7 +27,7 @@ import { readJsonSync } from 'fs-extra';
 const cloneDeep = require('lodash.clonedeep');
 const { replaceZeroAddressShorthand } = AddressUtils;
 
-import { getBlockchainDefaults, getContractDefaults } from './configDefaults';
+import { getBlockchainDefaults, getContractDefaults, embarkConfigDefaults } from './configDefaults';
 
 const constants = readJsonSync(path.join(__dirname, '../constants.json'));
 
@@ -84,15 +84,7 @@ export class Config {
 
   events: Events;
 
-  embarkConfig: EmbarkConfig = {
-    contracts: [],
-    config: '',
-    versions: {
-      solc: ''
-    },
-    generationDir: '',
-    migrations: ''
-  };
+  embarkConfig: EmbarkConfig = embarkConfigDefaults;
 
   context: any;
 
@@ -193,7 +185,6 @@ export class Config {
 
     this.embarkConfig = fs.readJSONSync(options.embarkConfig);
     this.embarkConfig.plugins = this.embarkConfig.plugins || {};
-    this.embarkConfig.migrations = this.embarkConfig.migrations || constants.defaultMigrationsDir;
 
     this.plugins = new Plugins({
       plugins: this.embarkConfig.plugins,
@@ -639,17 +630,7 @@ export class Config {
   }
 
   loadEmbarkConfigFile() {
-    const configObject = {
-      options: {
-        solc: {
-          "optimize": true,
-          "optimize-runs": 200
-        }
-      },
-      generationDir: "embarkArtifacts"
-    };
-
-    this.embarkConfig = recursiveMerge(configObject, this.embarkConfig);
+    this.embarkConfig = recursiveMerge(embarkConfigDefaults, this.embarkConfig);
 
     const contracts = this.embarkConfig.contracts;
     // determine contract 'root' directories

diff --git a/packages/core/core/src/configDefaults.ts b/packages/core/core/src/configDefaults.ts
@@ -4,6 +4,22 @@ import { join } from "path";
 
 const constants = readJsonSync(join(__dirname, '../constants.json'));
 
+export const embarkConfigDefaults = {
+  contracts: [],
+  config: '',
+  migrations: 'migrations',
+  versions: {
+    solc: "0.6.1"
+  },
+  options: {
+    solc: {
+      "optimize": true,
+      "optimize-runs": 200
+    }
+  },
+  generationDir: "embarkArtifacts"
+};
+
 export function getBlockchainDefaults(env) {
   const defaults = {
     clientConfig: {