From 6e8589e9b3c23761b9d06a0c36465368b65edada Mon Sep 17 00:00:00 2001 From: Gordon Hall Date: Sat, 19 Apr 2014 10:44:55 -0400 Subject: [PATCH] add extend dependency, use to extend defaults with config in PeerManager instead of overwiting all --- PeerManager.js | 4 +++- package.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PeerManager.js b/PeerManager.js index 8e90317dc..4ee071e4a 100644 --- a/PeerManager.js +++ b/PeerManager.js @@ -1,5 +1,6 @@ var imports = require('soop').imports(); +var extend = imports.extend || require('extend'); var log = imports.log || require('./util/log'); var bitcoreDefaults = imports.config || require('./config'); var Connection = imports.Connection || require ('./Connection'); @@ -12,7 +13,8 @@ GetAdjustedTime = imports.GetAdjustedTime || function () { }; function PeerManager(config) { - this.config = config || bitcoreDefaults; + // extend defaults with config + this.config = extend(true, config || {}, bitcoreDefaults); this.active = false; this.timer = null; diff --git a/package.json b/package.json index 3bd99003a..059223267 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,8 @@ "socks5-client": "~0.3.6", "brfs": "=1.0.0", "chai": "=1.9.1", - "uglifyify": "=1.2.3" + "uglifyify": "=1.2.3", + "extend": "~1.2.1" }, "devDependencies": { "grunt-contrib-watch": "~0.5.3",