refactor: fix pathnames.

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;
 
 /*

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) {

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;
 

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,

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;
 

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;
 

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:

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;
 
 /**

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.

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;
 

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;
 

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;
 

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

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

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);
 

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;
 
 /**

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;

lib/bcoin/env.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-var utils = require('./utils');
+var utils = require('./utils/utils');
 var global = utils.global;
 
 /**

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;

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;
 

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;
 
 /**

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');
 

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');

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)'

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;

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 */
 

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('./');
 
 /**

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;
 

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;
 
 /**

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).

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;
 

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

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;
 
 /**

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');

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',

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');
 

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

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;

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;
 

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;

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

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;

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);
 }

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;
 
 /**

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;
 

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;
 
 /**

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;
 
 /**

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]);

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;

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;
 

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([]);

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;
 
 /**

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.

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([]);
 
 /**

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

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;
 
 /**

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

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;
 

lib/bcoin/timedata.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-var utils = require('./utils');
+var utils = require('./utils/utils');
 var EventEmitter = require('events').EventEmitter;
 
 /**

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;
 

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');
 
 /**

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;
 
 /**

lib/bcoin/utils/reader.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
 var assert = utils.assert;
 
 /**

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;
 
 /**

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;

lib/bcoin/utils/writer.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
 var assert = utils.assert;
 
 /*

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:

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');
 
 /**

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
 

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;
 
 /**

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() {

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;

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;

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() {

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() {