From 812fde9b452fbbe489dde473059c2e05ccbd23e8 Mon Sep 17 00:00:00 2001 From: Takehiro Miyao Date: Mon, 5 Feb 2018 03:03:52 +0000 Subject: [PATCH] merge config in develop --- lib/environment.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/environment.js b/lib/environment.js index 7d417f7..f4506bc 100644 --- a/lib/environment.js +++ b/lib/environment.js @@ -7,6 +7,7 @@ var TestRPC = require("ethereumjs-testrpc"); var spawn = require("child_process").spawn; var path = require("path"); var Develop = require("./develop"); +var _ = require("lodash"); var Environment = { // It's important config is a Config object and not a vanilla object @@ -117,12 +118,12 @@ var Environment = { var network = config.network || "develop"; var url = `http://${testrpcOptions.host}:${testrpcOptions.port}/`; - config.networks[network] = { + config.networks[network] = _.extend({}, { network_id: testrpcOptions.network_id, provider: function() { return new Web3.providers.HttpProvider(url); } - }; + }, config.networks[network]); config.network = network;