diff --git a/lib/http/rpc.js b/lib/http/rpc.js index e1b5d457..82736f25 100644 --- a/lib/http/rpc.js +++ b/lib/http/rpc.js @@ -439,7 +439,7 @@ RPC.prototype.disconnectnode = co(function* disconnectnode(args) { RPC.prototype.getaddednodeinfo = co(function* getaddednodeinfo(args) { var out = []; - var i, host, addr, peer, peers; + var host, addr, peer; if (args.help || args.length < 1 || args.length > 2) throw new RPCError('getaddednodeinfo dummy ( "node" )'); @@ -536,6 +536,8 @@ RPC.prototype.getpeerinfo = co(function* getpeerinfo(args) { }); RPC.prototype.ping = co(function* ping(args) { + var peer; + if (args.help || args.length !== 0) throw new RPCError('ping'); diff --git a/lib/net/peer.js b/lib/net/peer.js index b3fd95bd..19c65d20 100644 --- a/lib/net/peer.js +++ b/lib/net/peer.js @@ -15,7 +15,6 @@ var co = require('../utils/co'); var Parser = require('./parser'); var Framer = require('./framer'); var packets = require('./packets'); -var NetworkAddress = require('../primitives/netaddress'); var constants = require('../protocol/constants'); var InvItem = require('../primitives/invitem'); var Locker = require('../utils/locker'); @@ -27,9 +26,9 @@ var Block = require('../primitives/block'); var TX = require('../primitives/tx'); var errors = require('../btc/errors'); var List = require('../utils/list'); +var IP = require('../utils/ip'); var packetTypes = packets.types; var VerifyResult = errors.VerifyResult; -var IP = require('../utils/ip'); /** * Represents a remote peer. @@ -821,7 +820,7 @@ Peer.prototype.sendFeeRate = function sendFeeRate(rate) { */ Peer.prototype.destroy = function destroy() { - var i, j, keys, cmd, queue, entry, hash; + var i, keys, cmd, queue, entry, hash; if (this.destroyed) return; @@ -900,8 +899,6 @@ Peer.prototype.write = function write(data) { */ Peer.prototype.needsDrain = function needsDrain(size) { - var self = this; - if (this.maybeStall()) { this.destroy(); this.error('Peer stalled (drain).'); @@ -994,9 +991,6 @@ Peer.prototype.error = function error(err) { for (i = 0; i < args.length; i++) args[i] = arguments[i]; - if (typeof args[args.length - 1] === 'boolean') - keep = args.pop(); - msg = util.fmt.apply(util, args); err = new Error(msg); } @@ -1986,7 +1980,7 @@ Peer.prototype.handlePong = co(function* handlePong(packet) { Peer.prototype.handleGetAddr = co(function* handleGetAddr(packet) { var items = []; - var i, addr; + var addr; if (this.options.selfish) return; @@ -2769,14 +2763,6 @@ RequestEntry.prototype.stop = function stop() { } }; -/* - * Helpers - */ - -function compare(a, b) { - return a.id - b.id; -} - /* * Expose */ diff --git a/lib/net/pool.js b/lib/net/pool.js index fee56399..6ba6913e 100644 --- a/lib/net/pool.js +++ b/lib/net/pool.js @@ -24,13 +24,12 @@ var InvItem = require('../primitives/invitem'); var Locker = require('../utils/locker'); var Network = require('../protocol/network'); var Peer = require('./peer'); -var TX = require('../primitives/tx'); -var tcp = require('./tcp'); var request = require('../http/request'); +var List = require('../utils/list'); +var tcp = require('./tcp'); +var dns = require('./dns'); var VerifyError = errors.VerifyError; var VerifyResult = errors.VerifyResult; -var List = require('../utils/list'); -var dns = require('./dns'); /** * A pool of peers for handling all network activity. @@ -1066,7 +1065,6 @@ Pool.prototype.sendAlert = function sendAlert(alert) { */ Pool.prototype.createPeer = function createPeer(port, host) { - var self = this; var peer = new Peer(this); this.bindPeer(peer); @@ -1085,7 +1083,6 @@ Pool.prototype.createPeer = function createPeer(port, host) { */ Pool.prototype.acceptPeer = function acceptPeer(socket) { - var self = this; var peer = new Peer(this); this.bindPeer(peer); @@ -2627,14 +2624,6 @@ BroadcastItem.prototype.inspect = function inspect() { + '>'; }; -/* - * Helpers - */ - -function compare(a, b) { - return a.id - b.id; -} - /* * Expose */ diff --git a/lib/net/proxysocket.js b/lib/net/proxysocket.js index 24189ae0..9330e9cb 100644 --- a/lib/net/proxysocket.js +++ b/lib/net/proxysocket.js @@ -6,7 +6,6 @@ var BufferWriter = require('../utils/writer'); var assert = require('assert'); var EventEmitter = require('events').EventEmitter; var IOClient = require('socket.io-client'); -var IP = require('../utils/ip'); function ProxySocket(uri) { if (!(this instanceof ProxySocket)) diff --git a/lib/utils/ip.js b/lib/utils/ip.js index 21b58220..2d0d79f9 100644 --- a/lib/utils/ip.js +++ b/lib/utils/ip.js @@ -60,7 +60,7 @@ exports.parseHost = function parseHost(addr, fallback) { */ exports.hostname = function hostname(host, port) { - var version + var version; assert(typeof host === 'string'); assert(host.length > 0); @@ -176,10 +176,6 @@ exports.toString = function toString(ip) { */ exports.normalize = function normalize(ip) { - if (Buffer.isBuffer(ip)) { - assert(ip.length === 16); - return exports.toString(ip); - } return exports.toString(exports.toBuffer(ip)); };