less special treatment for loader peer.

This commit is contained in:
Christopher Jeffrey 2016-05-23 02:04:27 -07:00
parent 2b2a747eab
commit 8cf9b8c480
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD

View File

@ -802,11 +802,11 @@ Pool.prototype._handleInv = function _handleInv(hashes, peer, callback) {
if (!this.synced)
return callback();
if (!this.options.headers)
return this._handleBlocks(hashes, peer, callback);
utils.forEachSerial(hashes, function(hash, next) {
if (self.options.headers)
self.getHeaders(peer, null, hash, next);
else
self.getData(peer, self.block.type, hash, next);
self.getHeaders(peer, null, hash, next);
}, function(err) {
if (err)
return callback(err);
@ -852,15 +852,10 @@ Pool.prototype._handleBlock = function _handleBlock(block, peer, callback) {
peer.destroy();
return callback(err);
}
if (peer === self.peers.load) {
self.resolveOrphan(peer, null, block.hash('hex'), function(e) {
self.scheduleRequests(peer);
return callback(e || err);
});
return;
}
self.scheduleRequests(peer);
return callback(err);
return self.resolveOrphan(peer, null, block.hash('hex'), function(e) {
self.scheduleRequests(peer);
return callback(e || err);
});
}
self.rejects.add(block.hash());