Skip to content

Commit 85abc40

Browse files
committed
use the messages object associated with the peer
1 parent 6cff532 commit 85abc40

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

lib/pool.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22
var P2P = require('bitcore-p2p');
33
var Peer = P2P.Peer;
4-
var Messages = new P2P.Messages();
54
var bitcore = require('bitcore-lib');
65
var BlockHeader = bitcore.BlockHeader;
76
var EventEmitter = require('events').EventEmitter;
@@ -93,7 +92,7 @@ Pool.prototype._setLoaderPeer = function(peer) {
9392
this.peers.loader = peer;
9493
var lastHashIdx = this.chain.index.hashes.length - 1;
9594
// TODO: move this to an on('set-loader-peer') instead of being in here
96-
peer.sendMessage(new Messages.GetHeaders([this.chain.index.hashes[lastHashIdx]]));
95+
peer.sendMessage(new peer.messages.GetHeaders([this.chain.index.hashes[lastHashIdx]]));
9796
}
9897

9998
Pool.prototype._handlePeerConnect = function(peer) {
@@ -116,7 +115,7 @@ Pool.prototype._handlePeerReady = function(peer, addr) {
116115
// TODO: not ideal to stick this on the peer object
117116
// But its the simplest for now
118117
peer._pingTimer = (setInterval(function(){
119-
peer.sendMessage(new Messages.Ping());
118+
peer.sendMessage(peer.messages.Ping());
120119
},this.ping.interval));
121120

122121
//TODO: Smarter loader peer choosing
@@ -162,7 +161,7 @@ Pool.prototype._handlePeerInv = function(peer, message) {
162161
// If we got new blocks, GetHeaders
163162
if(blockHashes.length) {
164163
var lastHashIdx = this.chain.index.hashes.length - 1;
165-
peer.sendMessage(new Messages.GetHeaders([this.chain.index.hashes[lastHashIdx]]));
164+
peer.sendMessage(new peer.messages.GetHeaders([this.chain.index.hashes[lastHashIdx]]));
166165
}
167166
}
168167

@@ -177,7 +176,7 @@ Pool.prototype._handlePeerHeaders = function(peer, message) {
177176
// If we got 2000 messages, assume we still have more to get
178177
if(message.headers.length == 2000) {
179178
var lastHeader = message.headers[message.headers.length - 1];
180-
peer.sendMessage(new Messages.GetHeaders([lastHeader.id]));
179+
peer.sendMessage(new peer.messages.GetHeaders([lastHeader.id]));
181180
} else {
182181
this.emit('chain-full');
183182
}

0 commit comments

Comments
 (0)