Merge pull request #59 from braydonf/bug/pool-peer-network

Pool Network to Peer
This commit is contained in:
Esteban Ordano 2015-03-30 14:28:41 -03:00
commit aa0b0e2bc8
2 changed files with 28 additions and 0 deletions

View File

@ -193,6 +193,7 @@ Pool.prototype._connectPeer = function _connectPeer(addr) {
host: ip,
port: port,
messages: self.messages,
network: this.network,
relay: self.relay
});
@ -220,6 +221,7 @@ Pool.prototype._addConnectedPeer = function _addConnectedPeer(socket, addr) {
if (!this._connectedPeers[addr.hash]) {
var peer = new Peer({
socket: socket,
network: this.network,
messages: self.messages
});

View File

@ -417,6 +417,22 @@ describe('Pool', function() {
Peer.prototype.connect.calledOnce.should.equal(true);
connectStub.restore();
});
it('will pass network to peer', function() {
var connectStub = sinon.stub(Peer.prototype, 'connect');
var pool = new Pool({network: Networks.testnet, maxSize: 1});
var ipv6 = '2001:0db8:85a3:0042:1000:8a2e:0370:7334';
pool._addPeerEventHandlers = sinon.stub();
pool._connectPeer({
ip: {
v6: ipv6
},
hash: 'hash'
});
/* jshint sub: true */
pool._connectedPeers['hash'].network.should.equal(pool.network);
connectStub.restore();
});
});
describe('#_addConnectedPeer', function() {
@ -444,6 +460,16 @@ describe('Pool', function() {
pool._addPeerEventHandlers.calledOnce.should.equal(false);
});
it('will pass network to peer', function() {
/* jshint sub: true */
var pool = new Pool({network: Networks.testnet, maxSize: 1});
pool._addConnectedPeer({
on: sinon.stub()
}, {hash: 'hash'});
should.exist(pool._connectedPeers['hash']);
pool._connectedPeers['hash'].network.should.equal(pool.network);
});
});
describe('#listen', function() {