diff --git a/.jshintrc b/.jshintrc index 51cb648c..787e816d 100644 --- a/.jshintrc +++ b/.jshintrc @@ -33,7 +33,7 @@ "camelcase": false, "indent": 2, "maxlen": 110, - "newcap": true, + "newcap": false, "quotmark": "single", "laxbreak": true, diff --git a/lib/bcoin/abstractblock.js b/lib/bcoin/abstractblock.js index 83399b0b..b4bb15e8 100644 --- a/lib/bcoin/abstractblock.js +++ b/lib/bcoin/abstractblock.js @@ -5,9 +5,7 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; -var assert = utils.assert; -var constants = bcoin.protocol.constants; +var utils = require('./utils'); var network = bcoin.protocol.network; /** diff --git a/lib/bcoin/address.js b/lib/bcoin/address.js index 9f848a9e..416401d5 100644 --- a/lib/bcoin/address.js +++ b/lib/bcoin/address.js @@ -7,7 +7,6 @@ var bcoin = require('../bcoin'); var utils = bcoin.utils; var assert = utils.assert; -var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; /** diff --git a/lib/bcoin/block.js b/lib/bcoin/block.js index 43a1b74a..f3949b86 100644 --- a/lib/bcoin/block.js +++ b/lib/bcoin/block.js @@ -6,7 +6,7 @@ var bcoin = require('../bcoin'); var bn = require('bn.js'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; diff --git a/lib/bcoin/bloom.js b/lib/bcoin/bloom.js index 3a6de20e..4d8fb3db 100644 --- a/lib/bcoin/bloom.js +++ b/lib/bcoin/bloom.js @@ -4,8 +4,7 @@ * https://github.com/indutny/bcoin */ -var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); /** * Bloom diff --git a/lib/bcoin/chain.js b/lib/bcoin/chain.js index 999fa805..aa0d0650 100644 --- a/lib/bcoin/chain.js +++ b/lib/bcoin/chain.js @@ -10,7 +10,7 @@ var bcoin = require('../bcoin'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/chainblock.js b/lib/bcoin/chainblock.js index 1ac1f1ee..ed791c2a 100644 --- a/lib/bcoin/chainblock.js +++ b/lib/bcoin/chainblock.js @@ -4,13 +4,11 @@ * https://github.com/indutny/bcoin */ -var EventEmitter = require('events').EventEmitter; - var bcoin = require('../bcoin'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/chaindb.js b/lib/bcoin/chaindb.js index 95d0df10..5df19e20 100644 --- a/lib/bcoin/chaindb.js +++ b/lib/bcoin/chaindb.js @@ -7,9 +7,8 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); -var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var pad32 = utils.pad32; var DUMMY = new Buffer([]); diff --git a/lib/bcoin/coin.js b/lib/bcoin/coin.js index b1739bba..2601ff80 100644 --- a/lib/bcoin/coin.js +++ b/lib/bcoin/coin.js @@ -6,9 +6,8 @@ var bn = require('bn.js'); var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; -var constants = bcoin.protocol.constants; /** * Coin diff --git a/lib/bcoin/compactblock.js b/lib/bcoin/compactblock.js index d167bf2f..64616745 100644 --- a/lib/bcoin/compactblock.js +++ b/lib/bcoin/compactblock.js @@ -6,10 +6,8 @@ var bcoin = require('../bcoin'); var bn = require('bn.js'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; /** * CompactBlock diff --git a/lib/bcoin/datastore.js b/lib/bcoin/datastore.js index 9c2d8a4a..760afaad 100644 --- a/lib/bcoin/datastore.js +++ b/lib/bcoin/datastore.js @@ -6,9 +6,8 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); -var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var fs = bcoin.fs; var pad32 = utils.pad32; diff --git a/lib/bcoin/ec.js b/lib/bcoin/ec.js index f69d0c5e..c3557972 100644 --- a/lib/bcoin/ec.js +++ b/lib/bcoin/ec.js @@ -6,7 +6,7 @@ var bcoin = require('../bcoin'); var elliptic = require('elliptic'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var ec = exports; diff --git a/lib/bcoin/fullnode.js b/lib/bcoin/fullnode.js index da1da99e..277ef955 100644 --- a/lib/bcoin/fullnode.js +++ b/lib/bcoin/fullnode.js @@ -5,10 +5,7 @@ */ var bcoin = require('../bcoin'); -var bn = require('bn.js'); -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/hd.js b/lib/bcoin/hd.js index 8986b694..faa31b94 100644 --- a/lib/bcoin/hd.js +++ b/lib/bcoin/hd.js @@ -52,7 +52,7 @@ var bcoin = require('../bcoin'); var bn = require('bn.js'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; diff --git a/lib/bcoin/headers.js b/lib/bcoin/headers.js index 14b9ad52..d7a092ec 100644 --- a/lib/bcoin/headers.js +++ b/lib/bcoin/headers.js @@ -5,18 +5,13 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; -var assert = utils.assert; -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; +var utils = require('./utils'); /** * Headers */ function Headers(data) { - var self = this; - if (!(this instanceof Headers)) return new Headers(data); diff --git a/lib/bcoin/http/client.js b/lib/bcoin/http/client.js index c63c804a..23360aed 100644 --- a/lib/bcoin/http/client.js +++ b/lib/bcoin/http/client.js @@ -8,7 +8,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../../bcoin'); var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('../utils'); var assert = utils.assert; var request = require('./request'); diff --git a/lib/bcoin/http/http.js b/lib/bcoin/http/http.js index 0392cf82..57d59c33 100644 --- a/lib/bcoin/http/http.js +++ b/lib/bcoin/http/http.js @@ -6,7 +6,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../../bcoin'); -var utils = bcoin.utils; +var utils = require('../utils'); /** * HTTPServer diff --git a/lib/bcoin/http/index.js b/lib/bcoin/http/index.js index 7aa7e755..0f2df51a 100644 --- a/lib/bcoin/http/index.js +++ b/lib/bcoin/http/index.js @@ -2,3 +2,4 @@ exports.http = require('./http'); exports.server = require('./server'); exports.client = require('./client'); exports.request = require('./request'); +exports.provider = require('./provider'); diff --git a/lib/bcoin/http/provider.js b/lib/bcoin/http/provider.js index a20ea168..24d2d072 100644 --- a/lib/bcoin/http/provider.js +++ b/lib/bcoin/http/provider.js @@ -6,10 +6,8 @@ var EventEmitter = require('events').EventEmitter; -var bcoin = require('../bcoin'); -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; -var utils = bcoin.utils; +var bcoin = require('../../bcoin'); +var utils = require('../utils'); var assert = utils.assert; var Client = require('./client'); diff --git a/lib/bcoin/http/request.js b/lib/bcoin/http/request.js index 891ce4dc..77f57524 100644 --- a/lib/bcoin/http/request.js +++ b/lib/bcoin/http/request.js @@ -5,7 +5,7 @@ */ var Stream = require('stream').Stream; -var assert = require('assert'); +var assert = require('../utils').assert; // Spoof by default var USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1)' diff --git a/lib/bcoin/http/server.js b/lib/bcoin/http/server.js index 0520dffd..1f5835fa 100644 --- a/lib/bcoin/http/server.js +++ b/lib/bcoin/http/server.js @@ -7,9 +7,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../../bcoin'); var HTTPServer = require('./http'); -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('../utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/input.js b/lib/bcoin/input.js index 8f551f07..d902ae09 100644 --- a/lib/bcoin/input.js +++ b/lib/bcoin/input.js @@ -5,9 +5,8 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; -var constants = bcoin.protocol.constants; /** * Input diff --git a/lib/bcoin/keypair.js b/lib/bcoin/keypair.js index 81951dd7..e32d5624 100644 --- a/lib/bcoin/keypair.js +++ b/lib/bcoin/keypair.js @@ -5,9 +5,8 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; -var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; /** diff --git a/lib/bcoin/lru.js b/lib/bcoin/lru.js index d44f0fd3..f219f63f 100644 --- a/lib/bcoin/lru.js +++ b/lib/bcoin/lru.js @@ -4,8 +4,7 @@ * https://github.com/indutny/bcoin */ -var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/mempool.js b/lib/bcoin/mempool.js index 2541a3e8..8e06af03 100644 --- a/lib/bcoin/mempool.js +++ b/lib/bcoin/mempool.js @@ -9,8 +9,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/merkleblock.js b/lib/bcoin/merkleblock.js index 3878bff4..9887a687 100644 --- a/lib/bcoin/merkleblock.js +++ b/lib/bcoin/merkleblock.js @@ -5,10 +5,7 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; -var assert = utils.assert; -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; +var utils = require('./utils'); /** * MerkleBlock diff --git a/lib/bcoin/miner.js b/lib/bcoin/miner.js index 2500faa0..dbe6ca11 100644 --- a/lib/bcoin/miner.js +++ b/lib/bcoin/miner.js @@ -5,7 +5,7 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; diff --git a/lib/bcoin/mtx.js b/lib/bcoin/mtx.js index b3230578..cc93d6ef 100644 --- a/lib/bcoin/mtx.js +++ b/lib/bcoin/mtx.js @@ -7,7 +7,7 @@ var bn = require('bn.js'); var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var Script = bcoin.script; diff --git a/lib/bcoin/node.js b/lib/bcoin/node.js index 9cf245de..4df49c7f 100644 --- a/lib/bcoin/node.js +++ b/lib/bcoin/node.js @@ -6,10 +6,8 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); -var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; -var utils = bcoin.utils; -var assert = utils.assert; +var utils = require('./utils'); /** * Node diff --git a/lib/bcoin/output.js b/lib/bcoin/output.js index d57b8074..f8dcd83b 100644 --- a/lib/bcoin/output.js +++ b/lib/bcoin/output.js @@ -6,9 +6,8 @@ var bn = require('bn.js'); var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; -var constants = bcoin.protocol.constants; /** * Output diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js index deaf5f5e..803c4e65 100644 --- a/lib/bcoin/peer.js +++ b/lib/bcoin/peer.js @@ -8,7 +8,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); var bn = require('bn.js'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; diff --git a/lib/bcoin/pool.js b/lib/bcoin/pool.js index 3526a0e5..99e574a6 100644 --- a/lib/bcoin/pool.js +++ b/lib/bcoin/pool.js @@ -7,7 +7,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var network = bcoin.protocol.network; var constants = bcoin.protocol.constants; diff --git a/lib/bcoin/profiler.js b/lib/bcoin/profiler.js index f74befc6..1d54bbb2 100644 --- a/lib/bcoin/profiler.js +++ b/lib/bcoin/profiler.js @@ -5,7 +5,7 @@ */ var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var fs = bcoin.fs; var profiler; diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/protocol/framer.js index 226567a1..54e16ac6 100644 --- a/lib/bcoin/protocol/framer.js +++ b/lib/bcoin/protocol/framer.js @@ -7,8 +7,7 @@ var bcoin = require('../../bcoin'); var network = require('./network'); var constants = require('./constants'); -var bn = require('bn.js'); -var utils = bcoin.utils; +var utils = require('../utils'); var assert = utils.assert; /** @@ -644,7 +643,7 @@ Framer.reject = function reject(details, writer) { var p = new BufferWriter(writer); p.writeVarString(details.message || '', 'ascii'); - p.writeU8(detals.ccode || constants.reject.malformed); + p.writeU8(details.ccode || constants.reject.malformed); p.writeVarString(details.reason || '', 'ascii'); if (details.data) p.writeBytes(details.data); diff --git a/lib/bcoin/protocol/network.js b/lib/bcoin/protocol/network.js index 78802e60..5265b80f 100644 --- a/lib/bcoin/protocol/network.js +++ b/lib/bcoin/protocol/network.js @@ -4,10 +4,8 @@ * https://github.com/indutny/bcoin */ -var bcoin = require('../../bcoin'); var bn = require('bn.js'); -var utils = bcoin.utils; -var assert = utils.assert; +var utils = require('../utils'); /** * Network diff --git a/lib/bcoin/protocol/parser.js b/lib/bcoin/protocol/parser.js index ee6e7669..4f72cf95 100644 --- a/lib/bcoin/protocol/parser.js +++ b/lib/bcoin/protocol/parser.js @@ -7,7 +7,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../../bcoin'); -var utils = bcoin.utils; +var utils = require('../utils'); var assert = utils.assert; var constants = require('./constants'); var network = require('./network'); diff --git a/lib/bcoin/ramdisk.js b/lib/bcoin/ramdisk.js index d35d9c7d..798f99e7 100644 --- a/lib/bcoin/ramdisk.js +++ b/lib/bcoin/ramdisk.js @@ -4,8 +4,7 @@ * https://github.com/indutny/bcoin */ -var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/script.js b/lib/bcoin/script.js index 09fe4189..9f01272d 100644 --- a/lib/bcoin/script.js +++ b/lib/bcoin/script.js @@ -7,7 +7,7 @@ var bcoin = require('../bcoin'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = bcoin.utils.assert; var script = exports; diff --git a/lib/bcoin/script2.js b/lib/bcoin/script2.js index 8d251b95..9afe2018 100644 --- a/lib/bcoin/script2.js +++ b/lib/bcoin/script2.js @@ -7,8 +7,8 @@ var bcoin = require('../bcoin'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; -var utils = bcoin.utils; -var assert = bcoin.utils.assert; +var utils = require('./utils'); +var assert = utils.assert; function Witness(items) { if (!(this instanceof Witness)) @@ -1316,8 +1316,6 @@ Script.getRedeem = function getRedeem(code) { }; Script.prototype.getType = function getType() { - var program; - if (this.isCommitment()) return 'commitment'; diff --git a/lib/bcoin/spvnode.js b/lib/bcoin/spvnode.js index cffa44da..127a1e2a 100644 --- a/lib/bcoin/spvnode.js +++ b/lib/bcoin/spvnode.js @@ -5,9 +5,7 @@ */ var bcoin = require('../bcoin'); -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; /** @@ -79,7 +77,7 @@ SPVNode.prototype._init = function _init() { passphrase: this.options.passphrase }; - this.createWallet(options, function(err, wallet) { + this.createWallet(options, function(err) { if (err) throw err; diff --git a/lib/bcoin/tx-pool.js b/lib/bcoin/tx-pool.js index ff7fceaa..f62fdf81 100644 --- a/lib/bcoin/tx-pool.js +++ b/lib/bcoin/tx-pool.js @@ -6,7 +6,7 @@ var bn = require('bn.js'); var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = bcoin.utils.assert; var EventEmitter = require('events').EventEmitter; diff --git a/lib/bcoin/tx.js b/lib/bcoin/tx.js index 230c2307..c38101bd 100644 --- a/lib/bcoin/tx.js +++ b/lib/bcoin/tx.js @@ -7,7 +7,7 @@ var bn = require('bn.js'); var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var Script = bcoin.script; diff --git a/lib/bcoin/txdb.js b/lib/bcoin/txdb.js index 1c189bb8..450c38b2 100644 --- a/lib/bcoin/txdb.js +++ b/lib/bcoin/txdb.js @@ -6,7 +6,7 @@ var bn = require('bn.js'); var bcoin = require('../bcoin'); -var utils = bcoin.utils; +var utils = require('./utils'); var assert = bcoin.utils.assert; var EventEmitter = require('events').EventEmitter; var DUMMY = new Buffer([]); diff --git a/lib/bcoin/wallet.js b/lib/bcoin/wallet.js index 9f66116d..c3f5be36 100644 --- a/lib/bcoin/wallet.js +++ b/lib/bcoin/wallet.js @@ -6,7 +6,7 @@ var bcoin = require('../bcoin'); var EventEmitter = require('events').EventEmitter; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var network = bcoin.protocol.network; diff --git a/lib/bcoin/walletdb.js b/lib/bcoin/walletdb.js index e5bc0d1f..6fc367c6 100644 --- a/lib/bcoin/walletdb.js +++ b/lib/bcoin/walletdb.js @@ -7,9 +7,7 @@ var EventEmitter = require('events').EventEmitter; var bcoin = require('../bcoin'); -var constants = bcoin.protocol.constants; -var network = bcoin.protocol.network; -var utils = bcoin.utils; +var utils = require('./utils'); var assert = utils.assert; var DUMMY = new Buffer([]);