Browse Source

replace extend with underscore and use it's version of extend from within PeerManager

patch-2
Gordon Hall 11 years ago
parent
commit
bf1b4bdcc7
  1. 4
      lib/PeerManager.js
  2. 4
      package.json

4
lib/PeerManager.js

@ -1,5 +1,5 @@
var imports = require('soop').imports();
var extend = imports.extend || require('extend');
var _ = imports._ || require('underscore');
var log = imports.log || require('../util/log');
var bitcoreDefaults = imports.config || require('../config');
var Connection = imports.Connection || require ('./Connection');
@ -12,7 +12,7 @@ GetAdjustedTime = imports.GetAdjustedTime || function () {
function PeerManager(config) {
// extend defaults with config
this.config = extend(true, config || {}, bitcoreDefaults);
this.config = _.extend(bitcoreDefaults, config || {});
this.active = false;
this.timer = null;

4
package.json

@ -71,8 +71,8 @@
"brfs": "=1.0.0",
"chai": "=1.9.1",
"uglifyify": "=1.2.3",
"extend": "~1.2.1",
"async": "~0.2.10"
"async": "~0.2.10",
"underscore": "~1.6.0"
},
"devDependencies": {
"grunt-contrib-watch": "~0.5.3",

Loading…
Cancel
Save