pkg: switch from jshint to eslint.

.eslintrc.json

@@ -0,0 +1,39 @@
+{
+  "extends": "eslint:recommended",
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 8
+  },
+  "rules": {
+    "indent": ["error", 2, {
+      "SwitchCase": 1,
+      "CallExpression": {
+        "arguments": "off"
+      },
+      "ArrayExpression": "off"
+    }],
+    "linebreak-style": ["error", "unix"],
+    "quotes": ["error", "single"],
+    "semi": ["error", "always"],
+    "no-console": 0,
+    "no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "none",
+      "ignoreRestSiblings": false
+    }],
+    "no-func-assign": 0,
+    "no-cond-assign": 0,
+    "no-unreachable": 0,
+    "no-fallthrough": 0,
+    "no-useless-escape": 0,
+    "no-unsafe-finally": 0,
+    "no-extra-semi": 0,
+    "handle-callback-err": 0,
+    "no-buffer-constructor": 2,
+    "no-tabs": 2
+  }
+}

.jshintrc

@@ -1,51 +0,0 @@
-{
-  "bitwise": false,
-  "esversion": 6,
-  "curly": false,
-  "eqeqeq": true,
-  "freeze": true,
-  "latedef": "nofunc",
-  "maxparams": 7,
-  "noarg": true,
-  "shadow": "inner",
-  "undef": true,
-  "unused": "vars",
-
-  "boss": true,
-  "expr": true,
-  "eqnull": true,
-  "evil": true,
-  "loopfunc": true,
-  "proto": true,
-  "supernew": true,
-
-  "-W018": true,
-  "-W064": true,
-  "-W086": true,
-  "-W032": true,
-  "-W021": true,
-
-  "browser": true,
-  "browserify": true,
-  "node": true,
-  "nonstandard": true,
-  "typed": true,
-  "worker": false,
-
-  "camelcase": false,
-  "indent": 2,
-  "maxlen": 110,
-  "newcap": false,
-  "quotmark": "single",
-
-  "laxbreak": true,
-  "laxcomma": true,
-
-  "noyield": true,
-
-  "predef": [
-    "it",
-    "describe",
-    "beforeEach"
-  ]
-}

bench/walletdb.js

@@ -6,7 +6,7 @@ var crypto = require('../lib/crypto/crypto');
 var WalletDB = require('../lib/wallet/walletdb');
 var MTX = require('../lib/primitives/mtx');
 var Outpoint = require('../lib/primitives/outpoint');
-var walletdb, runBench;
+var walletdb;
 
 function dummy() {
   var hash = crypto.randomBytes(32).toString('hex');
@@ -20,7 +20,7 @@ walletdb = new WalletDB({
   verify: false
 });
 
-runBench = co(function* runBench() {
+async function runBench() {
   var i, j, wallet, addrs, jobs, end;
   var result, tx, mtx, options;
 
@@ -115,6 +115,6 @@ runBench = co(function* runBench() {
   };
   yield wallet.createTX(options);
   end(1);
-});
+}
 
 runBench().then(process.exit);

lib/blockchain/chaindb.js

@@ -13,7 +13,6 @@ var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');
 var Amount = require('../btc/amount');
 var encoding = require('../utils/encoding');
-var co = require('../utils/co');
 var Network = require('../protocol/network');
 var CoinView = require('../coins/coinview');
 var Coins = require('../coins/coins');

lib/blockchain/chainentry.js

@@ -17,7 +17,6 @@ var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');
 var Headers = require('../primitives/headers');
 var InvItem = require('../primitives/invitem');
-var co = require('../utils/co');
 
 /**
  * Represents an entry in the chain. Unlike

lib/coins/coinview.js

@@ -7,7 +7,6 @@
 'use strict';
 
 var assert = require('assert');
-var co = require('../utils/co');
 var Coins = require('./coins');
 var UndoCoins = require('./undocoins');
 var BufferReader = require('../utils/reader');

lib/crypto/aes.js

@@ -415,7 +415,7 @@ AESKey.prototype.decryptBlock = function decryptBlock(input) {
     kp += 8;
 
     if (--r === 0)
-        break;
+      break;
 
     s0 = TD0[(t0 >>> 24) & 0xff]
       ^ TD1[(t3 >>> 16) & 0xff]

lib/crypto/hmac-drbg.js

@@ -50,7 +50,6 @@ HmacDRBG.prototype.init = function init(entropy, nonce, pers) {
 
 HmacDRBG.prototype.reseed = function reseed(entropy, nonce, pers) {
   var seed = POOL112;
-  var i;
 
   assert(Buffer.isBuffer(entropy));
   assert(Buffer.isBuffer(nonce));

lib/crypto/schnorr.js

@@ -6,15 +6,13 @@
 
 'use strict';
 
+var assert = require('assert');
 var elliptic = require('elliptic');
 var Signature = require('elliptic/lib/elliptic/ec/signature');
 var BN = require('./bn');
 var HmacDRBG = require('./hmac-drbg');
 var sha256 = require('./backend').sha256;
-var secp256k1 = elliptic.ec('secp256k1');
+var curve = elliptic.ec('secp256k1').curve;
-var curve = secp256k1.curve;
-var curves = elliptic.curves;
-var hash = curves.secp256k1.hash;
 var POOL64 = Buffer.allocUnsafe(64);
 
 /**
@@ -51,7 +49,7 @@ schnorr.hash = function _hash(msg, r) {
  */
 
 schnorr.trySign = function trySign(msg, prv, k, pn) {
-  var r, pn, h, s;
+  var r, h, s;
 
   if (prv.cmpn(0) === 0)
     throw new Error('Bad private key.');

lib/hd/private.js

@@ -13,7 +13,6 @@ var ec = require('../crypto/ec');
 var Network = require('../protocol/network');
 var StaticWriter = require('../utils/staticwriter');
 var BufferReader = require('../utils/reader');
-var StaticWriter = require('../utils/staticwriter');
 var base58 = require('../utils/base58');
 var encoding = require('../utils/encoding');
 var common = require('./common');

lib/http/client.js

@@ -12,7 +12,6 @@ var AsyncObject = require('../utils/asyncobject');
 var RPCClient = require('./rpcclient');
 var Amount = require('../btc/amount');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var request = require('./request');
 
 /**

lib/http/rpcbase.js

@@ -9,7 +9,6 @@
 var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Lock = require('../utils/lock');
 var Logger = require('../node/logger');
 

lib/http/rpcclient.js

@@ -9,7 +9,6 @@
 var Network = require('../protocol/network');
 var request = require('./request');
 var util = require('../utils/util');
-var co = require('../utils/co');
 
 /**
  * Bcoin RPC client.

lib/http/server.js

@@ -10,7 +10,6 @@
 var assert = require('assert');
 var HTTPBase = require('./base');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var base58 = require('../utils/base58');
 var Amount = require('../btc/amount');
 var Bloom = require('../utils/bloom');

lib/http/wallet.js

@@ -11,7 +11,6 @@ var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var Network = require('../protocol/network');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Client = require('./client');
 
 /**

lib/mempool/fees.js

@@ -463,23 +463,19 @@ PolicyEstimator.VERSION = 0;
  */
 
 PolicyEstimator.prototype.init = function init() {
+  var minFee = this.minTrackedFee;
+  var minPri = this.minTrackedPri;
   var fee = [];
   var priority = [];
-  var boundary;
+  var b;
 
-  for (boundary = this.minTrackedFee;
+  for (b = minFee; b <= MAX_FEERATE; b *= FEE_SPACING)
-       boundary <= MAX_FEERATE;
+    fee.push(b);
-       boundary *= FEE_SPACING) {
-    fee.push(boundary);
-  }
 
   fee.push(INF_FEERATE);
 
-  for (boundary = this.minTrackedPri;
+  for (b = minPri; b <= MAX_PRIORITY; b *= PRI_SPACING)
-       boundary <= MAX_PRIORITY;
+    priority.push(b);
-       boundary *= PRI_SPACING) {
-    priority.push(boundary);
-  }
 
   priority.push(INF_PRIORITY);
 

lib/mempool/mempool.js

@@ -11,12 +11,10 @@ var AsyncObject = require('../utils/asyncobject');
 var common = require('../blockchain/common');
 var policy = require('../protocol/policy');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var crypto = require('../crypto/crypto');
 var errors = require('../protocol/errors');
 var Bloom = require('../utils/bloom');
 var Address = require('../primitives/address');
-var Coin = require('../primitives/coin');
 var Script = require('../script/script');
 var Outpoint = require('../primitives/outpoint');
 var TX = require('../primitives/tx');

lib/mining/miner.js

@@ -9,7 +9,6 @@
 
 var assert = require('assert');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Heap = require('../utils/heap');
 var AsyncObject = require('../utils/asyncobject');
 var Amount = require('../btc/amount');

lib/net/pool.js

@@ -720,7 +720,7 @@ Pool.prototype.forceSync = function forceSync() {
  * Send a sync to each peer.
  */
 
-Pool.prototype.sync = function* sync(force) {
+Pool.prototype.sync = function sync(force) {
   this.resync(false);
 };
 

lib/net/socks.js

@@ -14,7 +14,6 @@ var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var net = require('net');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var IP = require('../utils/ip');
 var StaticWriter = require('../utils/staticwriter');
 var BufferReader = require('../utils/reader');

lib/net/upnp.js

@@ -637,7 +637,7 @@ function parseServices(el) {
 
   for (i = 0; i < children.length; i++) {
     child = children[i];
-    services.push(parseService(children[i]));
+    services.push(parseService(child));
   }
 
   return services;

lib/node/fullnode.js

@@ -8,7 +8,6 @@
 'use strict';
 
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Node = require('./node');
 var Chain = require('../blockchain/chain');
 var Fees = require('../mempool/fees');

lib/node/logger.js

@@ -352,7 +352,7 @@ Logger.prototype._reopen = async function reopen() {
  * @returns {Promise}
  */
 
-Logger.prototype.retry = function* retry() {
+Logger.prototype.retry = function retry() {
   assert(this.timer == null);
   this.timer = co.setTimeout(function() {
     this.timer = null;

lib/node/node.js

@@ -10,7 +10,6 @@
 var assert = require('assert');
 var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Network = require('../protocol/network');
 var Logger = require('./logger');
 var workerPool = require('../workers/workerpool').pool;

lib/node/nodeclient.js

@@ -7,7 +7,6 @@
 'use strict';
 
 var util = require('../utils/util');
-var co = require('../utils/co');
 var AsyncObject = require('../utils/asyncobject');
 
 /**

lib/node/spvnode.js

@@ -8,7 +8,6 @@
 'use strict';
 
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Lock = require('../utils/lock');
 var Node = require('./node');
 var Chain = require('../blockchain/chain');

lib/primitives/coin.js

@@ -9,7 +9,6 @@
 
 var assert = require('assert');
 var util = require('../utils/util');
-var Network = require('../protocol/network');
 var Amount = require('../btc/amount');
 var Output = require('./output');
 var Script = require('../script/script');

lib/primitives/keyring.js

@@ -642,7 +642,7 @@ KeyRing.prototype.ownHash = function ownHash(hash) {
   if (this.script) {
     if (hash.equals(this.getScriptHash()))
       return true;
-   }
+  }
 
   if (this.witness) {
     if (hash.equals(this.getNestedHash()))

lib/primitives/mtx.js

@@ -9,7 +9,6 @@
 
 var assert = require('assert');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Script = require('../script/script');
 var TX = require('./tx');
 var Input = require('./input');

lib/primitives/tx.js

@@ -10,7 +10,6 @@
 var assert = require('assert');
 var util = require('../utils/util');
 var encoding = require('../utils/encoding');
-var co = require('../utils/co');
 var crypto = require('../crypto/crypto');
 var ec = require('../crypto/ec');
 var Amount = require('../btc/amount');

lib/utils/asyncemitter.js

@@ -7,7 +7,6 @@
 'use strict';
 
 var assert = require('assert');
-var co = require('./co');
 
 /**
  * Represents a promise-resolving event emitter.

lib/utils/asyncobject.js

@@ -9,7 +9,6 @@
 var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var util = require('./util');
-var co = require('./co');
 var Lock = require('./lock');
 
 /**

lib/utils/gcs.js

@@ -443,8 +443,6 @@ function BitReader(data) {
 }
 
 BitReader.prototype.readBit = function readBit() {
-  var bit;
-
   if (this.pos >= this.stream.length)
     throw new Error('EOF');
 

lib/wallet/account.js

@@ -7,7 +7,6 @@
 'use strict';
 
 var util = require('../utils/util');
-var co = require('../utils/co');
 var assert = require('assert');
 var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');

lib/wallet/client.js

@@ -15,7 +15,6 @@ var Headers = require('../primitives/headers');
 var Amount = require('../btc/amount');
 var util = require('../utils/util');
 var BufferReader = require('../utils/reader');
-var co = require('../utils/co');
 var IOClient = require('socket.io-client');
 
 /**

lib/wallet/http.js

@@ -10,7 +10,6 @@
 var assert = require('assert');
 var HTTPBase = require('../http/base');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var base58 = require('../utils/base58');
 var MTX = require('../primitives/mtx');
 var Outpoint = require('../primitives/outpoint');

lib/wallet/masterkey.js

@@ -9,7 +9,6 @@
 var assert = require('assert');
 var util = require('../utils/util');
 var Lock = require('../utils/lock');
-var co = require('../utils/co');
 var crypto = require('../crypto/crypto');
 var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');

lib/wallet/rpc.js

@@ -9,7 +9,6 @@
 var assert = require('assert');
 var fs = require('../utils/fs');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var crypto = require('../crypto/crypto');
 var Amount = require('../btc/amount');
 var Script = require('../script/script');
@@ -722,8 +721,7 @@ RPC.prototype.importWallet = async function importWallet(args, help) {
   var rescan = valid.bool(1, false);
   var keys = [];
   var i, lines, line, parts;
-  var secret, time, label, addr;
+  var secret, data, key;
-  var data, key;
 
   if (help || args.length !== 1)
     throw new RPCError(errs.MISC_ERROR, 'importwallet "filename" ( rescan )');
@@ -751,10 +749,6 @@ RPC.prototype.importWallet = async function importWallet(args, help) {
 
     secret = parseSecret(parts[0], this.network);
 
-    time = +parts[1];
-    label = parts[2];
-    addr = parts[parts.length - 1];
-
     keys.push(secret);
   }
 

lib/wallet/txdb.js

@@ -9,7 +9,6 @@
 
 var util = require('../utils/util');
 var LRU = require('../utils/lru');
-var co = require('../utils/co');
 var assert = require('assert');
 var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');
@@ -1174,7 +1173,7 @@ TXDB.prototype.erase = async function erase(wtx, block) {
   var height = block ? block.height : -1;
   var details = new Details(this, wtx, block);
   var i, path, account, credits;
-  var input, output, coin, credit;
+  var output, coin, credit;
 
   if (!tx.isCoinbase()) {
     // We need to undo every part of the
@@ -1183,7 +1182,6 @@ TXDB.prototype.erase = async function erase(wtx, block) {
     credits = await this.getSpentCredits(tx);
 
     for (i = 0; i < tx.inputs.length; i++) {
-      input = tx.inputs[i];
       credit = credits[i];
 
       if (!credit) {
@@ -1373,7 +1371,7 @@ TXDB.prototype.disconnect = async function disconnect(wtx, block) {
   var height = block.height;
   var details = new Details(this, wtx, block);
   var i, account, output, coin, credits;
-  var input, path, credit;
+  var path, credit;
 
   assert(block);
 
@@ -1386,7 +1384,6 @@ TXDB.prototype.disconnect = async function disconnect(wtx, block) {
     credits = await this.getSpentCredits(tx);
 
     for (i = 0; i < tx.inputs.length; i++) {
-      input = tx.inputs[i];
       credit = credits[i];
 
       if (!credit)
@@ -2185,7 +2182,7 @@ TXDB.prototype.getAccountCoins = async function getAccountCoins(account) {
 
 TXDB.prototype.getSpentCoins = async function getSpentCoins(tx) {
   var coins = [];
-  var i, input, credits, credit;
+  var i, credits, credit;
 
   if (tx.isCoinbase())
     return coins;
@@ -2193,7 +2190,6 @@ TXDB.prototype.getSpentCoins = async function getSpentCoins(tx) {
   credits = await this.getSpentCredits(tx);
 
   for (i = 0; i < tx.inputs.length; i++) {
-    input = tx.inputs[i];
     credit = credits[i];
 
     if (!credit) {

lib/wallet/wallet.js

@@ -13,7 +13,6 @@ var Network = require('../protocol/network');
 var util = require('../utils/util');
 var encoding = require('../utils/encoding');
 var Lock = require('../utils/lock');
-var co = require('../utils/co');
 var crypto = require('../crypto/crypto');
 var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');

lib/wallet/walletdb.js

@@ -10,7 +10,6 @@
 var assert = require('assert');
 var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
-var co = require('../utils/co');
 var Lock = require('../utils/lock');
 var LRU = require('../utils/lru');
 var encoding = require('../utils/encoding');

lib/wallet/walletkey.js

@@ -10,7 +10,6 @@
 var util = require('../utils/util');
 var Address = require('../primitives/address');
 var KeyRing = require('../primitives/keyring');
-var Script = require('../script/script');
 var Path = require('./path');
 
 /**

package.json

@@ -41,9 +41,9 @@
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-plugin-transform-regenerator": "^6.24.1",
     "browserify": "^14.3.0",
+    "eslint": "^4.1.0",
     "hash.js": "^1.0.3",
     "jsdoc": "^3.4.3",
-    "jshint": "^2.9.4",
     "level-js": "^2.2.4",
     "mocha": "^3.4.1",
     "uglify-js": "^3.0.5"
@@ -62,7 +62,7 @@
     "browserify": "browserify --im -o browser/bcoin.js lib/bcoin.js && browserify --im -o browser/bcoin-master.js lib/workers/master.js",
     "uglify": "uglifyjs -m -o browser/bcoin.min.js browser/bcoin.js && uglifyjs -m -o browser/bcoin-master.min.js browser/bcoin-master.js",
     "clean": "rm browser/bcoin.js browser/bcoin.min.js browser/bcoin-master.js browser/bcoin-master.min.js",
-    "lint": "jshint lib/ || exit 0",
+    "lint": "eslint lib/ || exit 0",
     "docs": "jsdoc -c jsdoc.json"
   },
   "browser": {

test/util/memwallet.js

@@ -390,11 +390,11 @@ MemWallet.prototype.sign = function sign(mtx) {
   mtx.sign(keys);
 };
 
-MemWallet.prototype.create = co(function* create(options) {
+MemWallet.prototype.create = async function create(options) {
   var mtx = new MTX(options);
   var tx;
 
-  yield this.fund(mtx, options);
+  await this.fund(mtx, options);
 
   assert(mtx.getFee() <= MTX.Selector.MAX_FEE, 'TX exceeds MAX_FEE.');
 
@@ -409,13 +409,13 @@ MemWallet.prototype.create = co(function* create(options) {
     throw new Error('Cannot sign tx.');
 
   return mtx;
-});
+};
 
-MemWallet.prototype.send = co(function* send(options) {
+MemWallet.prototype.send = async function send(options) {
-  var mtx = yield this.create(options);
+  var mtx = await this.create(options);
   this.addTX(mtx.toTX());
   return mtx;
-});
+};
 
 function Path(hash, branch, index) {
   this.hash = hash;

test/util/node-context.js

@@ -81,23 +81,23 @@ NodeContext.prototype.close = function close() {
   return Promise.all(jobs);
 };
 
-NodeContext.prototype.connect = co(function* connect() {
+NodeContext.prototype.connect = async function connect() {
   var i, node;
 
   for (i = 0; i < this.nodes.length; i++) {
     node = this.nodes[i];
-    yield node.connect();
+    await node.connect();
-    yield co.timeout(1000);
+    await co.timeout(1000);
   }
-});
+};
 
-NodeContext.prototype.disconnect = co(function* disconnect() {
+NodeContext.prototype.disconnect = async function disconnect() {
   var i, node;
 
   for (i = this.nodes.length - 1; i >= 0; i--) {
     node = this.nodes[i];
-    yield node.disconnect();
+    await node.disconnect();
-    yield co.timeout(1000);
+    await co.timeout(1000);
   }
 });
 
@@ -123,17 +123,17 @@ NodeContext.prototype.stopSync = function stopSync() {
   }
 };
 
-NodeContext.prototype.generate = co(function* generate(index, blocks) {
+NodeContext.prototype.generate = async function generate(index, blocks) {
   var node = this.nodes[index];
   var i, block;
 
   assert(node);
 
   for (i = 0; i < blocks; i++) {
-    block = yield node.miner.mineBlock();
+    block = await node.miner.mineBlock();
-    yield node.chain.add(block);
+    await node.chain.add(block);
   }
-});
+};
 
 NodeContext.prototype.height = function height(index) {
   var node = this.nodes[index];
@@ -143,8 +143,8 @@ NodeContext.prototype.height = function height(index) {
   return node.chain.height;
 };
 
-NodeContext.prototype.sync = co(function* sync() {
+NodeContext.prototype.sync = async function sync() {
-  yield co.timeout(3000);
+  await co.timeout(3000);
-});
+};
 
 module.exports = NodeContext;