Skip to content
This repository has been archived by the owner on Jun 14, 2018. It is now read-only.

merge config in develop #80

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down