This commit is contained in:
Christopher Jeffrey 2016-06-21 13:59:05 -07:00
parent bb63c5d164
commit a8cf57ab7d
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 13 additions and 14 deletions

View File

@ -1537,23 +1537,19 @@ Peer.prototype._handleGetData = function _handleGetData(items) {
*/ */
Peer.prototype._handleAddr = function _handleAddr(addrs) { Peer.prototype._handleAddr = function _handleAddr(addrs) {
var hosts = []; var i;
var i, addr;
for (i = 0; i < addrs.length; i++) { for (i = 0; i < addrs.length; i++)
addr = addrs[i]; this.addrFilter.add(addrs[i].host, 'ascii');
this.addrFilter.add(addr.host, 'ascii');
hosts.push(addr);
}
bcoin.debug( bcoin.debug(
'Received %d addrs (hosts=%d, peers=%d) (%s).', 'Received %d addrs (hosts=%d, peers=%d) (%s).',
hosts.length, addrs.length,
this.pool.hosts.length, this.pool.hosts.length,
this.pool.peers.all.length, this.pool.peers.all.length,
this.hostname); this.hostname);
this.fire('addr', hosts); this.fire('addr', addrs);
}; };
/** /**
@ -1681,8 +1677,11 @@ Peer.prototype._handleInv = function _handleInv(items) {
if (txs.length > 0) if (txs.length > 0)
this.emit('txs', txs); this.emit('txs', txs);
if (unknown != null) if (unknown != null) {
bcoin.debug('Peer sent an unknown inv type: %d (%s).', unknown); bcoin.debug(
'Peer sent an unknown inv type: %d (%s).',
unknown, this.hostname);
}
}; };
/** /**
@ -2043,7 +2042,7 @@ NetworkAddress.prototype.fromOptions = function fromOptions(options) {
if (IP.version(host) !== -1) if (IP.version(host) !== -1)
host = IP.normalize(host); host = IP.normalize(host);
assert(typeof host === 'string'); assert(typeof options.host === 'string');
assert(typeof options.port === 'number'); assert(typeof options.port === 'number');
assert(typeof options.services === 'number'); assert(typeof options.services === 'number');
assert(typeof options.ts === 'number'); assert(typeof options.ts === 'number');

View File

@ -628,7 +628,7 @@ Framer.tx = function _tx(tx, writer) {
*/ */
Framer.witnessTX = function _witnessTX(tx, writer) { Framer.witnessTX = function _witnessTX(tx, writer) {
return tx.toWitness(writer); return tx.toRaw(writer);
}; };
/** /**
@ -651,7 +651,7 @@ Framer.block = function _block(block, writer) {
*/ */
Framer.witnessBlock = function _witnessBlock(block, writer) { Framer.witnessBlock = function _witnessBlock(block, writer) {
return block.toWitness(writer); return block.toRaw(writer);
}; };
/** /**