Merge pull request #74 from maraoz/fix/testnet-peer

fix PeerSync for testnet
bitpay · May 13, 2014 · 5cf6ce4 · 5cf6ce4
2 parents 77a4f29 + 19c2b10
commit 5cf6ce4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/config/config.js b/config/config.js
@@ -31,6 +31,7 @@ else {
   p2p_port = '18333';
 }
 
+
 switch(process.env.NODE_ENV) {
   case 'production':
     env += '';

diff --git a/lib/PeerSync.js b/lib/PeerSync.js
@@ -4,6 +4,7 @@ var bitcore     = require('bitcore');
 var bitcoreUtil = bitcore.util;
 var Sync        = require('./Sync');
 var Peer        = bitcore.Peer;
+var PeerManager = bitcore.PeerManager;
 var config      = require('../config/config');
 var networks    = bitcore.networks;
 var sockets     = require('../app/controllers/socket.js');
@@ -16,10 +17,10 @@ function PeerSync(opts) {
   this.connected = false;
   this.peerdb = undefined;
   this.allowReorgs = false;
-  this.PeerManager = require('soop').load('../node_modules/bitcore/lib/PeerManager',{
-    network: (config.network === 'testnet' ? networks.testnet : networks.livenet)
-  });
-  this.peerman = new this.PeerManager();
+  var pmConfig = {
+    network: config.network
+  };
+  this.peerman = new PeerManager(pmConfig);
   this.load_peers();
   this.sync = new Sync(opts);
 }