From 7f6849b6a6137eaee22286f7912863761ca23cb5 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 23 Aug 2016 22:43:20 -0700 Subject: [PATCH] refactor: fix pathnames. --- lib/bcoin.js | 2 +- lib/bcoin/bip70/asn1.js | 2 +- lib/bcoin/bip70/pk.js | 2 +- lib/bcoin/bip70/protobuf.js | 6 +++--- lib/bcoin/bip70/x509.js | 2 +- lib/bcoin/chain/chain.js | 6 +++--- lib/bcoin/chain/chaindb.js | 10 +++++----- lib/bcoin/chain/chainentry.js | 8 ++++---- lib/bcoin/chain/coins.js | 6 +++--- lib/bcoin/chain/coinview.js | 2 +- lib/bcoin/config.js | 2 +- lib/bcoin/crypto/ec.js | 2 +- lib/bcoin/crypto/scrypt-async.js | 2 +- lib/bcoin/crypto/scrypt.js | 2 +- lib/bcoin/db/ldb.js | 4 ++-- lib/bcoin/db/lowlevelup.js | 4 ++-- lib/bcoin/db/rbt.js | 2 +- lib/bcoin/env.js | 2 +- lib/bcoin/fees.js | 4 ++-- lib/bcoin/fullnode.js | 2 +- lib/bcoin/http/base.js | 4 ++-- lib/bcoin/http/client.js | 4 ++-- lib/bcoin/http/index.js | 2 +- lib/bcoin/http/request.js | 2 +- lib/bcoin/http/rpc.js | 2 +- lib/bcoin/http/server.js | 2 +- lib/bcoin/http/wallet.js | 2 +- lib/bcoin/logger.js | 2 +- lib/bcoin/mempool.js | 8 ++++---- lib/bcoin/miner.js | 8 ++++---- lib/bcoin/net/bip150.js | 4 ++-- lib/bcoin/net/bip151.js | 6 +++--- lib/bcoin/net/bip152.js | 6 +++--- lib/bcoin/net/peer.js | 8 ++++---- lib/bcoin/net/pool.js | 12 ++++++------ lib/bcoin/network.js | 2 +- lib/bcoin/node.js | 4 ++-- lib/bcoin/primitives/abstractblock.js | 2 +- lib/bcoin/primitives/address.js | 8 ++++---- lib/bcoin/primitives/block.js | 4 ++-- lib/bcoin/primitives/bloom.js | 6 +++--- lib/bcoin/primitives/coin.js | 4 ++-- lib/bcoin/primitives/hd.js | 26 +++++++++++++------------- lib/bcoin/primitives/headers.js | 4 ++-- lib/bcoin/primitives/input.js | 4 ++-- lib/bcoin/primitives/keyring.js | 6 +++--- lib/bcoin/primitives/memblock.js | 4 ++-- lib/bcoin/primitives/merkleblock.js | 4 ++-- lib/bcoin/primitives/mtx.js | 4 ++-- lib/bcoin/primitives/output.js | 4 ++-- lib/bcoin/primitives/script.js | 8 ++++---- lib/bcoin/primitives/tx.js | 6 +++--- lib/bcoin/protocol/constants.js | 2 +- lib/bcoin/protocol/framer.js | 4 ++-- lib/bcoin/protocol/network.js | 2 +- lib/bcoin/protocol/packets.js | 4 ++-- lib/bcoin/protocol/parser.js | 4 ++-- lib/bcoin/spvnode.js | 2 +- lib/bcoin/timedata.js | 2 +- lib/bcoin/utils/async.js | 2 +- lib/bcoin/utils/ip.js | 2 +- lib/bcoin/utils/locker.js | 2 +- lib/bcoin/utils/reader.js | 2 +- lib/bcoin/utils/uri.js | 2 +- lib/bcoin/utils/utils.js | 4 ++-- lib/bcoin/utils/writer.js | 2 +- lib/bcoin/wallet/txdb.js | 8 ++++---- lib/bcoin/wallet/wallet.js | 8 ++++---- lib/bcoin/wallet/walletdb.js | 10 +++++----- lib/bcoin/workers.js | 6 +++--- test/aes-test.js | 4 ++-- test/block-test.js | 2 +- test/chachapoly-test.js | 2 +- test/scrypt-test.js | 2 +- test/siphash-test.js | 2 +- 75 files changed, 162 insertions(+), 162 deletions(-) diff --git a/lib/bcoin.js b/lib/bcoin.js index 801c4680..8886b5b0 100644 --- a/lib/bcoin.js +++ b/lib/bcoin.js @@ -11,7 +11,7 @@ 'use strict'; var env = require('./bcoin/env'); -var utils = require('./bcoin/utils'); +var utils = require('./bcoin/utils/utils'); var global = utils.global; /* diff --git a/lib/bcoin/bip70/asn1.js b/lib/bcoin/bip70/asn1.js index 01f7d814..21b2faa2 100644 --- a/lib/bcoin/bip70/asn1.js +++ b/lib/bcoin/bip70/asn1.js @@ -30,7 +30,7 @@ 'use strict'; var assert = require('assert'); -var BufferReader = require('../reader'); +var BufferReader = require('../utils/reader'); var asn1 = exports; asn1.parseTag = function parseTag(p) { diff --git a/lib/bcoin/bip70/pk.js b/lib/bcoin/bip70/pk.js index fddc6d49..20b5d26b 100644 --- a/lib/bcoin/bip70/pk.js +++ b/lib/bcoin/bip70/pk.js @@ -9,7 +9,7 @@ var bn = require('bn.js'); var asn1 = require('./asn1'); var elliptic = require('elliptic'); -var utils = require('../utils'); +var utils = require('../utils/utils'); var crypto; diff --git a/lib/bcoin/bip70/protobuf.js b/lib/bcoin/bip70/protobuf.js index 29dac687..ce5af7f9 100644 --- a/lib/bcoin/bip70/protobuf.js +++ b/lib/bcoin/bip70/protobuf.js @@ -6,10 +6,10 @@ 'use strict'; -var utils = require('../utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var BufferReader = require('../reader'); -var BufferWriter = require('../writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); var wireType = { VARINT: 0, diff --git a/lib/bcoin/bip70/x509.js b/lib/bcoin/bip70/x509.js index 18754e93..6fb2cb39 100644 --- a/lib/bcoin/bip70/x509.js +++ b/lib/bcoin/bip70/x509.js @@ -8,7 +8,7 @@ var assert = require('assert'); var asn1 = require('./asn1'); -var utils = require('../utils'); +var utils = require('../utils/utils'); var pk = require('./pk'); var x509 = exports; diff --git a/lib/bcoin/chain/chain.js b/lib/bcoin/chain/chain.js index 59952542..8f18f9ce 100644 --- a/lib/bcoin/chain/chain.js +++ b/lib/bcoin/chain/chain.js @@ -7,10 +7,10 @@ 'use strict'; -var bcoin = require('./env'); -var AsyncObject = require('./async'); +var bcoin = require('../env'); +var AsyncObject = require('../utils/async'); var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var VerifyError = bcoin.errors.VerifyError; diff --git a/lib/bcoin/chain/chaindb.js b/lib/bcoin/chain/chaindb.js index 85cbc37e..9275c5c6 100644 --- a/lib/bcoin/chain/chaindb.js +++ b/lib/bcoin/chain/chaindb.js @@ -7,14 +7,14 @@ 'use strict'; -var bcoin = require('./env'); -var AsyncObject = require('./async'); +var bcoin = require('../env'); +var AsyncObject = require('../utils/async'); var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var DUMMY = new Buffer([0]); -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var BufferWriter = require('../utils/writer'); +var BufferReader = require('../utils/reader'); /* * Database Layout: diff --git a/lib/bcoin/chain/chainentry.js b/lib/bcoin/chain/chainentry.js index 246a991c..29cfb3e7 100644 --- a/lib/bcoin/chain/chainentry.js +++ b/lib/bcoin/chain/chainentry.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var BufferWriter = require('../utils/writer'); +var BufferReader = require('../utils/reader'); var InvItem = bcoin.packets.InvItem; /** diff --git a/lib/bcoin/chain/coins.js b/lib/bcoin/chain/coins.js index 7c6aa6b7..f877263d 100644 --- a/lib/bcoin/chain/coins.js +++ b/lib/bcoin/chain/coins.js @@ -7,12 +7,12 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var utils = bcoin.utils; var assert = utils.assert; var constants = bcoin.protocol.constants; -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); /** * Represents the outputs for a single transaction. diff --git a/lib/bcoin/chain/coinview.js b/lib/bcoin/chain/coinview.js index a7952481..61d4f57f 100644 --- a/lib/bcoin/chain/coinview.js +++ b/lib/bcoin/chain/coinview.js @@ -7,7 +7,7 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var utils = bcoin.utils; var assert = utils.assert; diff --git a/lib/bcoin/config.js b/lib/bcoin/config.js index c79ea9c3..2d65d73c 100644 --- a/lib/bcoin/config.js +++ b/lib/bcoin/config.js @@ -7,7 +7,7 @@ 'use strict'; var Network = require('./network'); -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = utils.assert; var fs; diff --git a/lib/bcoin/crypto/ec.js b/lib/bcoin/crypto/ec.js index f477f0ef..74912553 100644 --- a/lib/bcoin/crypto/ec.js +++ b/lib/bcoin/crypto/ec.js @@ -9,7 +9,7 @@ var elliptic = require('elliptic'); var bn = require('bn.js'); -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var crypto, secp256k1; diff --git a/lib/bcoin/crypto/scrypt-async.js b/lib/bcoin/crypto/scrypt-async.js index 207854a0..2fe0a415 100644 --- a/lib/bcoin/crypto/scrypt-async.js +++ b/lib/bcoin/crypto/scrypt-async.js @@ -33,7 +33,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); /** * Javascript scrypt implementation. Scrypt is diff --git a/lib/bcoin/crypto/scrypt.js b/lib/bcoin/crypto/scrypt.js index 20f38941..a68abd50 100644 --- a/lib/bcoin/crypto/scrypt.js +++ b/lib/bcoin/crypto/scrypt.js @@ -33,7 +33,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); /** * Javascript scrypt implementation. Scrypt is diff --git a/lib/bcoin/db/ldb.js b/lib/bcoin/db/ldb.js index d4b86c0a..8ea6bcc9 100644 --- a/lib/bcoin/db/ldb.js +++ b/lib/bcoin/db/ldb.js @@ -10,7 +10,7 @@ 'use strict'; var LowlevelUp = require('./lowlevelup'); -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; /** @@ -116,7 +116,7 @@ ldb.parseOptions = function parseOptions(options) { if (backend.name === 'rbt') db = require('./rbt'); else if (utils.isBrowser) - db = require('../../browser/ldb'); + db = require('../../../browser/ldb'); else db = require(backend.name); diff --git a/lib/bcoin/db/lowlevelup.js b/lib/bcoin/db/lowlevelup.js index ff01e5d8..cc71e3d4 100644 --- a/lib/bcoin/db/lowlevelup.js +++ b/lib/bcoin/db/lowlevelup.js @@ -7,9 +7,9 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var AsyncObject = require('./async'); +var AsyncObject = require('../utils/async'); var VERSION_ERROR; /** diff --git a/lib/bcoin/db/rbt.js b/lib/bcoin/db/rbt.js index d63709f1..fe407ebe 100644 --- a/lib/bcoin/db/rbt.js +++ b/lib/bcoin/db/rbt.js @@ -6,7 +6,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var DUMMY = new Buffer([0]); var RED = 0; diff --git a/lib/bcoin/env.js b/lib/bcoin/env.js index 6923616e..dfbf2963 100644 --- a/lib/bcoin/env.js +++ b/lib/bcoin/env.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./utils/utils'); var global = utils.global; /** diff --git a/lib/bcoin/fees.js b/lib/bcoin/fees.js index 5bbcc80b..d96f6cd8 100644 --- a/lib/bcoin/fees.js +++ b/lib/bcoin/fees.js @@ -12,8 +12,8 @@ var bcoin = require('./env'); var utils = bcoin.utils; var assert = require('assert'); var constants = bcoin.protocol.constants; -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('./utils/reader'); +var BufferWriter = require('./utils/writer'); var global = bcoin.utils.global; var Float64Array = global.Float64Array || Array; var Int32Array = global.Int32Array || Array; diff --git a/lib/bcoin/fullnode.js b/lib/bcoin/fullnode.js index 114154e0..1958c731 100644 --- a/lib/bcoin/fullnode.js +++ b/lib/bcoin/fullnode.js @@ -9,7 +9,7 @@ var bcoin = require('./env'); var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = utils.assert; var Node = bcoin.node; diff --git a/lib/bcoin/http/base.js b/lib/bcoin/http/base.js index c6d0ff77..1aaadd7d 100644 --- a/lib/bcoin/http/base.js +++ b/lib/bcoin/http/base.js @@ -7,8 +7,8 @@ 'use strict'; -var AsyncObject = require('../async'); -var utils = require('../utils'); +var AsyncObject = require('../utils/async'); +var utils = require('../utils/utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/http/client.js b/lib/bcoin/http/client.js index e61a1f1e..dea46d9d 100644 --- a/lib/bcoin/http/client.js +++ b/lib/bcoin/http/client.js @@ -8,9 +8,9 @@ 'use strict'; var Network = require('../network'); -var AsyncObject = require('../async'); +var AsyncObject = require('../utils/async'); var RPCClient = require('./rpcclient'); -var utils = require('../utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var request = require('./request'); diff --git a/lib/bcoin/http/index.js b/lib/bcoin/http/index.js index 4a5e9dff..124f1f60 100644 --- a/lib/bcoin/http/index.js +++ b/lib/bcoin/http/index.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('../utils'); +var utils = require('../utils/utils'); if (!utils.isBrowser) { exports.request = require('./request'); diff --git a/lib/bcoin/http/request.js b/lib/bcoin/http/request.js index 5d7c9159..950616b7 100644 --- a/lib/bcoin/http/request.js +++ b/lib/bcoin/http/request.js @@ -14,7 +14,7 @@ */ var Stream = require('stream').Stream; -var assert = require('../utils').assert; +var assert = require('../utils/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/rpc.js b/lib/bcoin/http/rpc.js index b9f8ec22..7e081feb 100644 --- a/lib/bcoin/http/rpc.js +++ b/lib/bcoin/http/rpc.js @@ -7,7 +7,7 @@ 'use strict'; var bcoin = require('../env'); -var utils = require('../utils'); +var utils = require('../utils/utils'); var IP = require('../ip'); var assert = utils.assert; var constants = bcoin.protocol.constants; diff --git a/lib/bcoin/http/server.js b/lib/bcoin/http/server.js index 7ac56d46..d73f6b3e 100644 --- a/lib/bcoin/http/server.js +++ b/lib/bcoin/http/server.js @@ -14,7 +14,7 @@ var EventEmitter = require('events').EventEmitter; var constants = bcoin.protocol.constants; var http = require('./'); var HTTPBase = http.base; -var utils = require('../utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var RPC; /*= require('./rpc'); - load lazily */ diff --git a/lib/bcoin/http/wallet.js b/lib/bcoin/http/wallet.js index cdbc84a3..74108caa 100644 --- a/lib/bcoin/http/wallet.js +++ b/lib/bcoin/http/wallet.js @@ -10,7 +10,7 @@ var Network = require('../network'); var EventEmitter = require('events').EventEmitter; -var utils = require('../utils'); +var utils = require('../utils/utils'); var http = require('./'); /** diff --git a/lib/bcoin/logger.js b/lib/bcoin/logger.js index badc4622..75e77947 100644 --- a/lib/bcoin/logger.js +++ b/lib/bcoin/logger.js @@ -6,7 +6,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = require('assert'); var fs; diff --git a/lib/bcoin/mempool.js b/lib/bcoin/mempool.js index d92b1173..2ac3909a 100644 --- a/lib/bcoin/mempool.js +++ b/lib/bcoin/mempool.js @@ -13,12 +13,12 @@ */ var bcoin = require('./env'); -var AsyncObject = require('./async'); +var AsyncObject = require('./utils/async'); var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = utils.assert; -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var BufferWriter = require('./utils/writer'); +var BufferReader = require('./utils/reader'); var VerifyError = bcoin.errors.VerifyError; /** diff --git a/lib/bcoin/miner.js b/lib/bcoin/miner.js index d15cd126..79b6fe67 100644 --- a/lib/bcoin/miner.js +++ b/lib/bcoin/miner.js @@ -8,14 +8,14 @@ 'use strict'; var bcoin = require('./env'); -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var bn = require('bn.js'); var EventEmitter = require('events').EventEmitter; -var AsyncObject = require('./async'); -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var AsyncObject = require('./utils/async'); +var BufferReader = require('./utils/reader'); +var BufferWriter = require('./utils/writer'); /** * A bitcoin miner (supports mining witness blocks). diff --git a/lib/bcoin/net/bip150.js b/lib/bcoin/net/bip150.js index e99e42bc..a55833e0 100644 --- a/lib/bcoin/net/bip150.js +++ b/lib/bcoin/net/bip150.js @@ -9,8 +9,8 @@ 'use strict'; var EventEmitter = require('events').EventEmitter; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; diff --git a/lib/bcoin/net/bip151.js b/lib/bcoin/net/bip151.js index 09147536..dcc226e4 100644 --- a/lib/bcoin/net/bip151.js +++ b/lib/bcoin/net/bip151.js @@ -13,11 +13,11 @@ 'use strict'; var EventEmitter = require('events').EventEmitter; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; -var chachapoly = require('./chachapoly'); +var chachapoly = require('../crypto/chachapoly'); /* * Constants diff --git a/lib/bcoin/net/bip152.js b/lib/bcoin/net/bip152.js index 5bb2ab33..809ec3ff 100644 --- a/lib/bcoin/net/bip152.js +++ b/lib/bcoin/net/bip152.js @@ -6,11 +6,11 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; -var siphash = require('./siphash'); +var siphash = require('../crypto/siphash'); var AbstractBlock = bcoin.abstractblock; /** diff --git a/lib/bcoin/net/peer.js b/lib/bcoin/net/peer.js index 18d8063b..8365b135 100644 --- a/lib/bcoin/net/peer.js +++ b/lib/bcoin/net/peer.js @@ -7,10 +7,10 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var EventEmitter = require('events').EventEmitter; -var utils = require('./utils'); -var IP = require('./ip'); +var utils = require('../utils/utils'); +var IP = require('../utils/ip'); var assert = utils.assert; var constants = bcoin.protocol.constants; var InvItem = bcoin.packets.InvItem; @@ -459,7 +459,7 @@ Peer.prototype.createSocket = function createSocket(port, host) { socket = this._createSocket(port, host); } else { if (utils.isBrowser) { - proxy = require('../../browser/proxysocket'); + proxy = require('../../../browser/proxysocket'); socket = proxy.connect(this.pool.proxyServer, port, host); } else { net = require('net'); diff --git a/lib/bcoin/net/pool.js b/lib/bcoin/net/pool.js index 1acca6ed..50bcf522 100644 --- a/lib/bcoin/net/pool.js +++ b/lib/bcoin/net/pool.js @@ -7,11 +7,11 @@ 'use strict'; -var bcoin = require('./env'); -var AsyncObject = require('./async'); +var bcoin = require('../env'); +var AsyncObject = require('../utils/async'); var EventEmitter = require('events').EventEmitter; -var utils = require('./utils'); -var IP = require('./ip'); +var utils = require('../utils/utils'); +var IP = require('../utils/ip'); var assert = utils.assert; var constants = bcoin.protocol.constants; var VerifyError = bcoin.errors.VerifyError; @@ -1862,7 +1862,7 @@ Pool.prototype.getIP = function getIP(callback) { if (utils.isBrowser) return callback(new Error('Could not find IP.')); - request = require('./http/request'); + request = require('../http/request'); request({ method: 'GET', @@ -1893,7 +1893,7 @@ Pool.prototype.getIP2 = function getIP2(callback) { if (utils.isBrowser) return callback(new Error('Could not find IP.')); - request = require('./http/request'); + request = require('../http/request'); request({ method: 'GET', diff --git a/lib/bcoin/network.js b/lib/bcoin/network.js index cd7179c3..fd060cac 100644 --- a/lib/bcoin/network.js +++ b/lib/bcoin/network.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = utils.assert; var networks = require('./protocol/network'); diff --git a/lib/bcoin/node.js b/lib/bcoin/node.js index 165d3a0f..b3c0a624 100644 --- a/lib/bcoin/node.js +++ b/lib/bcoin/node.js @@ -8,8 +8,8 @@ 'use strict'; var bcoin = require('./env'); -var AsyncObject = require('./async'); -var utils = require('./utils'); +var AsyncObject = require('./utils/async'); +var utils = require('./utils/utils'); /** * Base class from which every other diff --git a/lib/bcoin/primitives/abstractblock.js b/lib/bcoin/primitives/abstractblock.js index fc7ce5d4..f387ff20 100644 --- a/lib/bcoin/primitives/abstractblock.js +++ b/lib/bcoin/primitives/abstractblock.js @@ -7,7 +7,7 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var constants = bcoin.protocol.constants; var utils = bcoin.utils; var assert = utils.assert; diff --git a/lib/bcoin/primitives/address.js b/lib/bcoin/primitives/address.js index 7807b10d..1ea9135f 100644 --- a/lib/bcoin/primitives/address.js +++ b/lib/bcoin/primitives/address.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var networks = bcoin.protocol.network; var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var BufferWriter = require('../utils/writer'); +var BufferReader = require('../utils/reader'); var Script = bcoin.script; var scriptTypes = constants.scriptTypes; diff --git a/lib/bcoin/primitives/block.js b/lib/bcoin/primitives/block.js index 5157dbb5..1792b426 100644 --- a/lib/bcoin/primitives/block.js +++ b/lib/bcoin/primitives/block.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var AbstractBlock = bcoin.abstractblock; diff --git a/lib/bcoin/primitives/bloom.js b/lib/bcoin/primitives/bloom.js index 215b9145..9670540d 100644 --- a/lib/bcoin/primitives/bloom.js +++ b/lib/bcoin/primitives/bloom.js @@ -7,10 +7,10 @@ 'use strict'; -var constants = require('./protocol/constants'); +var constants = require('../protocol/constants'); var assert = require('assert'); -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); /* * Constants diff --git a/lib/bcoin/primitives/coin.js b/lib/bcoin/primitives/coin.js index b1455d85..daf5b340 100644 --- a/lib/bcoin/primitives/coin.js +++ b/lib/bcoin/primitives/coin.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var constants = bcoin.protocol.constants; var assert = utils.assert; var Output = bcoin.output; diff --git a/lib/bcoin/primitives/hd.js b/lib/bcoin/primitives/hd.js index cc059edc..e56b45e5 100644 --- a/lib/bcoin/primitives/hd.js +++ b/lib/bcoin/primitives/hd.js @@ -78,16 +78,16 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); -var ec = require('./ec'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); +var ec = require('../crypto/ec'); var assert = utils.assert; var constants = bcoin.protocol.constants; var networks = bcoin.protocol.network; var KeyRing = bcoin.keyring; -var LRU = require('./lru'); -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var LRU = require('../utils/lru'); +var BufferWriter = require('../utils/writer'); +var BufferReader = require('../utils/reader'); var unorm; /* @@ -448,17 +448,17 @@ Mnemonic.getLanguage = function getLanguage(word) { Mnemonic.getWordlist = function getWordlist(language) { switch (language) { case 'simplified chinese': - return require('../../etc/chinese-simplified.js'); + return require('../../../etc/chinese-simplified.js'); case 'traditional chinese': - return require('../../etc/chinese-traditional.js'); + return require('../../../etc/chinese-traditional.js'); case 'english': - return require('../../etc/english.js'); + return require('../../../etc/english.js'); case 'french': - return require('../../etc/french.js'); + return require('../../../etc/french.js'); case 'italian': - return require('../../etc/italian.js'); + return require('../../../etc/italian.js'); case 'japanese': - return require('../../etc/japanese.js'); + return require('../../../etc/japanese.js'); default: throw new Error('Unknown language: ' + language); } @@ -2213,7 +2213,7 @@ function nfkd(str) { return str.normalize('NFKD'); if (!unorm) - unorm = require('../../vendor/unorm'); + unorm = require('../../../vendor/unorm'); return unorm.nfkd(str); } diff --git a/lib/bcoin/primitives/headers.js b/lib/bcoin/primitives/headers.js index eea9e1b3..bffd2dc4 100644 --- a/lib/bcoin/primitives/headers.js +++ b/lib/bcoin/primitives/headers.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var AbstractBlock = bcoin.abstractblock; /** diff --git a/lib/bcoin/primitives/input.js b/lib/bcoin/primitives/input.js index 2ef42ab1..ee226167 100644 --- a/lib/bcoin/primitives/input.js +++ b/lib/bcoin/primitives/input.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; diff --git a/lib/bcoin/primitives/keyring.js b/lib/bcoin/primitives/keyring.js index d923fc19..c22d0730 100644 --- a/lib/bcoin/primitives/keyring.js +++ b/lib/bcoin/primitives/keyring.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var constants = bcoin.protocol.constants; var utils = bcoin.utils; var assert = utils.assert; var network = bcoin.protocol.network; -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); var scriptTypes = constants.scriptTypes; /** diff --git a/lib/bcoin/primitives/memblock.js b/lib/bcoin/primitives/memblock.js index 3543fa2e..04cad769 100644 --- a/lib/bcoin/primitives/memblock.js +++ b/lib/bcoin/primitives/memblock.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var AbstractBlock = bcoin.abstractblock; /** diff --git a/lib/bcoin/primitives/merkleblock.js b/lib/bcoin/primitives/merkleblock.js index 2370e88b..bc83d4b9 100644 --- a/lib/bcoin/primitives/merkleblock.js +++ b/lib/bcoin/primitives/merkleblock.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var DUMMY = new Buffer([0]); diff --git a/lib/bcoin/primitives/mtx.js b/lib/bcoin/primitives/mtx.js index 67301b71..28e9973a 100644 --- a/lib/bcoin/primitives/mtx.js +++ b/lib/bcoin/primitives/mtx.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var Script = bcoin.script; diff --git a/lib/bcoin/primitives/output.js b/lib/bcoin/primitives/output.js index 6e829a16..0e2e35ce 100644 --- a/lib/bcoin/primitives/output.js +++ b/lib/bcoin/primitives/output.js @@ -7,8 +7,8 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var constants = bcoin.protocol.constants; var assert = utils.assert; diff --git a/lib/bcoin/primitives/script.js b/lib/bcoin/primitives/script.js index 8bed9b5d..c6f176c0 100644 --- a/lib/bcoin/primitives/script.js +++ b/lib/bcoin/primitives/script.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var bn = require('bn.js'); var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var BufferWriter = require('../utils/writer'); +var BufferReader = require('../utils/reader'); var opcodes = constants.opcodes; var STACK_TRUE = new Buffer([1]); var STACK_FALSE = new Buffer([]); diff --git a/lib/bcoin/primitives/tx.js b/lib/bcoin/primitives/tx.js index f8482145..194bcee8 100644 --- a/lib/bcoin/primitives/tx.js +++ b/lib/bcoin/primitives/tx.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; var Script = bcoin.script; var Stack = bcoin.stack; -var BufferWriter = require('./writer'); +var BufferWriter = require('../utils/writer'); var InvItem = bcoin.packets.InvItem; /** diff --git a/lib/bcoin/protocol/constants.js b/lib/bcoin/protocol/constants.js index 50076e61..5dceec80 100644 --- a/lib/bcoin/protocol/constants.js +++ b/lib/bcoin/protocol/constants.js @@ -11,7 +11,7 @@ * @module constants */ -var utils = require('../utils'); +var utils = require('../utils/utils'); /** * Minimum protocol version we're willing to talk to. diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/protocol/framer.js index 224aeee8..951ed324 100644 --- a/lib/bcoin/protocol/framer.js +++ b/lib/bcoin/protocol/framer.js @@ -8,9 +8,9 @@ 'use strict'; var bcoin = require('../env'); -var utils = require('../utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var BufferWriter = require('../writer'); +var BufferWriter = require('../utils/writer'); var DUMMY = new Buffer([]); /** diff --git a/lib/bcoin/protocol/network.js b/lib/bcoin/protocol/network.js index a08eeae1..61aeb601 100644 --- a/lib/bcoin/protocol/network.js +++ b/lib/bcoin/protocol/network.js @@ -8,7 +8,7 @@ 'use strict'; var bn = require('bn.js'); -var utils = require('../utils'); +var utils = require('../utils/utils'); /** * @module network diff --git a/lib/bcoin/protocol/packets.js b/lib/bcoin/protocol/packets.js index e6a4090a..5f767d26 100644 --- a/lib/bcoin/protocol/packets.js +++ b/lib/bcoin/protocol/packets.js @@ -9,9 +9,9 @@ var bcoin = require('../env'); var constants = require('./constants'); -var utils = require('../utils'); +var utils = require('../utils/utils'); var bn = require('bn.js'); -var IP = require('../ip'); +var IP = require('../utils/ip'); var assert = utils.assert; /** diff --git a/lib/bcoin/protocol/parser.js b/lib/bcoin/protocol/parser.js index 43dc6742..a0c223fa 100644 --- a/lib/bcoin/protocol/parser.js +++ b/lib/bcoin/protocol/parser.js @@ -9,10 +9,10 @@ var bcoin = require('../env'); var EventEmitter = require('events').EventEmitter; -var utils = require('../utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = require('./constants'); -var BufferReader = require('../reader'); +var BufferReader = require('../utils/reader'); /** * Protocol packet parser diff --git a/lib/bcoin/spvnode.js b/lib/bcoin/spvnode.js index f543b7da..1a52554b 100644 --- a/lib/bcoin/spvnode.js +++ b/lib/bcoin/spvnode.js @@ -8,7 +8,7 @@ 'use strict'; var bcoin = require('./env'); -var utils = require('./utils'); +var utils = require('./utils/utils'); var assert = utils.assert; var Node = bcoin.node; diff --git a/lib/bcoin/timedata.js b/lib/bcoin/timedata.js index a0ccefc1..83240486 100644 --- a/lib/bcoin/timedata.js +++ b/lib/bcoin/timedata.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('./utils/utils'); var EventEmitter = require('events').EventEmitter; /** diff --git a/lib/bcoin/utils/async.js b/lib/bcoin/utils/async.js index ae22963b..51b96df8 100644 --- a/lib/bcoin/utils/async.js +++ b/lib/bcoin/utils/async.js @@ -6,7 +6,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; var EventEmitter = require('events').EventEmitter; diff --git a/lib/bcoin/utils/ip.js b/lib/bcoin/utils/ip.js index 1b9639a0..22606a4e 100644 --- a/lib/bcoin/utils/ip.js +++ b/lib/bcoin/utils/ip.js @@ -7,7 +7,7 @@ 'use strict'; -var IP = require('../../vendor/ip'); +var IP = require('../../../vendor/ip'); var assert = require('assert'); /** diff --git a/lib/bcoin/utils/locker.js b/lib/bcoin/utils/locker.js index a632bf7b..9850e8c6 100644 --- a/lib/bcoin/utils/locker.js +++ b/lib/bcoin/utils/locker.js @@ -8,7 +8,7 @@ 'use strict'; var EventEmitter = require('events').EventEmitter; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/utils/reader.js b/lib/bcoin/utils/reader.js index 8781c399..3e880d92 100644 --- a/lib/bcoin/utils/reader.js +++ b/lib/bcoin/utils/reader.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/utils/uri.js b/lib/bcoin/utils/uri.js index 17580d98..d3943537 100644 --- a/lib/bcoin/utils/uri.js +++ b/lib/bcoin/utils/uri.js @@ -11,7 +11,7 @@ var url = require('url'); var querystring = require('querystring'); -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; /** diff --git a/lib/bcoin/utils/utils.js b/lib/bcoin/utils/utils.js index f0e76f88..bfb0e1ec 100644 --- a/lib/bcoin/utils/utils.js +++ b/lib/bcoin/utils/utils.js @@ -18,7 +18,7 @@ var utils = exports; var assert = require('assert'); var bn = require('bn.js'); var util = require('util'); -var crypto = require('./crypto'); +var crypto = require('../crypto/crypto'); var Number, Math, Date; var fs, crypto; @@ -462,7 +462,7 @@ utils.equal = function equal(a, b) { */ if (utils.isBrowser) - require('../../vendor/setimmediate'); + require('../../../vendor/setimmediate'); if (typeof setImmediate === 'function') { utils.nextTick = setImmediate; diff --git a/lib/bcoin/utils/writer.js b/lib/bcoin/utils/writer.js index 93b67182..df4decf4 100644 --- a/lib/bcoin/utils/writer.js +++ b/lib/bcoin/utils/writer.js @@ -7,7 +7,7 @@ 'use strict'; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; /* diff --git a/lib/bcoin/wallet/txdb.js b/lib/bcoin/wallet/txdb.js index 1e1043c5..52fdafce 100644 --- a/lib/bcoin/wallet/txdb.js +++ b/lib/bcoin/wallet/txdb.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); -var utils = require('./utils'); +var bcoin = require('../env'); +var utils = require('../utils/utils'); var assert = bcoin.utils.assert; var constants = bcoin.protocol.constants; var DUMMY = new Buffer([0]); -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); /* * Database Layout: diff --git a/lib/bcoin/wallet/wallet.js b/lib/bcoin/wallet/wallet.js index 453cc08d..6cc2ca4f 100644 --- a/lib/bcoin/wallet/wallet.js +++ b/lib/bcoin/wallet/wallet.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); +var bcoin = require('../env'); var EventEmitter = require('events').EventEmitter; var constants = bcoin.protocol.constants; -var utils = require('./utils'); +var utils = require('../utils/utils'); var assert = utils.assert; -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); var TXDB = require('./txdb'); /** diff --git a/lib/bcoin/wallet/walletdb.js b/lib/bcoin/wallet/walletdb.js index c7a13550..13d98e0e 100644 --- a/lib/bcoin/wallet/walletdb.js +++ b/lib/bcoin/wallet/walletdb.js @@ -7,13 +7,13 @@ 'use strict'; -var bcoin = require('./env'); -var AsyncObject = require('./async'); -var utils = require('./utils'); +var bcoin = require('../env'); +var AsyncObject = require('../utils/async'); +var utils = require('../utils/utils'); var assert = utils.assert; var constants = bcoin.protocol.constants; -var BufferReader = require('./reader'); -var BufferWriter = require('./writer'); +var BufferReader = require('../utils/reader'); +var BufferWriter = require('../utils/writer'); var TXDB = require('./txdb'); var MAX_POINT = String.fromCharCode(0xdbff, 0xdfff); // U+10FFFF diff --git a/lib/bcoin/workers.js b/lib/bcoin/workers.js index 59ac08b2..8fb7fcf3 100644 --- a/lib/bcoin/workers.js +++ b/lib/bcoin/workers.js @@ -10,11 +10,11 @@ var bcoin = require('./env'); var EventEmitter = require('events').EventEmitter; var bn = require('bn.js'); -var utils = require('./utils'); +var utils = require('./utils/utils'); var global = utils.global; var assert = utils.assert; -var BufferWriter = require('./writer'); -var BufferReader = require('./reader'); +var BufferWriter = require('./utils/writer'); +var BufferReader = require('./utils/reader'); var jobs; /** diff --git a/test/aes-test.js b/test/aes-test.js index b5ba98e5..8c19f281 100644 --- a/test/aes-test.js +++ b/test/aes-test.js @@ -1,9 +1,9 @@ 'use strict'; var bn = require('bn.js'); -var utils = require('../lib/bcoin/utils'); +var utils = require('../lib/bcoin/utils/utils'); var assert = require('assert'); -var aes = require('../lib/bcoin/aes'); +var aes = require('../lib/bcoin/crypto/aes'); var crypto = require('crypto'); describe('AES', function() { diff --git a/test/block-test.js b/test/block-test.js index ebb83a61..f6ba7fdc 100644 --- a/test/block-test.js +++ b/test/block-test.js @@ -9,7 +9,7 @@ var assert = require('assert'); var block300025 = require('./data/block300025.json'); var fs = require('fs'); var cmpct = fs.readFileSync(__dirname + '/data/compactblock.hex', 'utf8').trim().split('\n'); -var bip152 = require('../lib/bcoin/bip152'); +var bip152 = require('../lib/bcoin/net/bip152'); describe('Block', function() { var parser = bcoin.protocol.parser; diff --git a/test/chachapoly-test.js b/test/chachapoly-test.js index 53ff99f8..3d3a3b52 100644 --- a/test/chachapoly-test.js +++ b/test/chachapoly-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var chachapoly = require('../lib/bcoin/chachapoly'); +var chachapoly = require('../lib/bcoin/crypto/chachapoly'); var ChaCha20 = chachapoly.ChaCha20; var Poly1305 = chachapoly.Poly1305; var AEAD = chachapoly.AEAD; diff --git a/test/scrypt-test.js b/test/scrypt-test.js index 69827a4a..1d434cac 100644 --- a/test/scrypt-test.js +++ b/test/scrypt-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var scrypt = require('../lib/bcoin/scrypt'); +var scrypt = require('../lib/bcoin/crypto/scrypt'); describe('Scrypt', function() { it('should perform scrypt with N=16', function() { diff --git a/test/siphash-test.js b/test/siphash-test.js index 0ea36570..b99a0580 100644 --- a/test/siphash-test.js +++ b/test/siphash-test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var siphash = require('../lib/bcoin/siphash'); +var siphash = require('../lib/bcoin/crypto/siphash'); describe('SipHash', function() { it('should perform siphash with no data', function() {