zcash-hackworks
/
bitcore-lib-zcash
mirror of https://github.com/zcash-hackworks/bitcore-lib-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Gordon Hall 2014-04-28 12:23:56 -04:00
parent 3b2bda0745
commit bf1b4bdcc7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/PeerManager.js
View File

@ -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
View File

@ -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",