BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add extend dependency, use to extend defaults with config in PeerManager instead of overwiting all

This commit is contained in:
Gordon Hall 2014-04-19 10:44:55 -04:00
parent 9f278cf848
commit 6e8589e9b3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PeerManager.js
View File

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

3
package.json
View File

@ -70,7 +70,8 @@
"socks5-client": "~0.3.6", "socks5-client": "~0.3.6",
"brfs": "=1.0.0", "brfs": "=1.0.0",
"chai": "=1.9.1", "chai": "=1.9.1",
"uglifyify": "=1.2.3" "uglifyify": "=1.2.3",
"extend": "~1.2.1"
}, },
"devDependencies": { "devDependencies": {
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.5.3",