refactor: more restructuring (again).

bench/chacha.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var chachapoly = require('../lib/bcoin/chachapoly');
+var chachapoly = require('../lib/bcoin/crypto/chachapoly');
 var bench = require('./bench');
 
 console.log('note: rate measured in kb/s');

bench/coin.js

@@ -2,7 +2,7 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var network = bcoin.protocol.network;
 var utils = bcoin.utils;
 var assert = require('assert');

bench/tx.js

@@ -2,7 +2,7 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var network = bcoin.protocol.network;
 var utils = bcoin.utils;
 var assert = require('assert');

bench/walletdb.js

@@ -2,7 +2,7 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var network = bcoin.protocol.network;
 var utils = bcoin.utils;
 var assert = require('assert');

lib/bcoin/chain/chain.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var AsyncObject = require('../utils/async');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var VerifyError = bcoin.errors.VerifyError;

lib/bcoin/chain/chaindb.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var AsyncObject = require('../utils/async');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var DUMMY = new Buffer([0]);

lib/bcoin/chain/chainentry.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var bn = require('bn.js');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var BufferWriter = require('../utils/writer');

lib/bcoin/chain/coins.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = bcoin.utils;
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var BufferReader = require('../utils/reader');
 var BufferWriter = require('../utils/writer');
 

lib/bcoin/env.js

@@ -56,11 +56,8 @@ var global = utils.global;
  * @property {Function} uri - See {@link module:uri}.
  * @property {Function} logger - {@link Logger} constructor.
  *
- * @property {Object} protocol
- * @property {Function} protocol.constants - See {@link module:constants}.
- * @property {Function} protocol.network - See {@link module:network}.
- * @property {Function} protocol.framer - {@link Framer} constructor.
- * @property {Function} protocol.parser - {@link Parser} constructor.
+ * @property {Object} constants - See {@link module:constants}.
+ * @property {Object} networks - See {@link module:network}.
  * @property {Object} errors
  * @property {Function} errors.VerifyError - {@link VerifyError} constructor.
  * @property {Function} errors.ScriptError - {@link ScriptError} constructor.
@@ -127,7 +124,8 @@ function Environment() {
   this.logger = require('./node/logger');
   this.config = require('./node/config');
 
-  this.protocol = require('./protocol');
+  this.constants = require('./protocol/constants');
+  this.networks = require('./protocol/networks');
   this.packets = require('./net/packets');
   this.network = require('./protocol/network');
   this.errors = require('./utils/errors');

lib/bcoin/http/rpc.js

@@ -10,7 +10,7 @@ var bcoin = require('../env');
 var utils = require('../utils/utils');
 var IP = require('../ip');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var fs;
 
 try {

lib/bcoin/http/server.js

@@ -11,7 +11,7 @@
 
 var bcoin = require('../env');
 var EventEmitter = require('events').EventEmitter;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var http = require('./');
 var HTTPBase = http.base;
 var utils = require('../utils/utils');

lib/bcoin/mempool/fees.js

@@ -11,7 +11,7 @@
 var bcoin = require('../env');
 var utils = bcoin.utils;
 var assert = require('assert');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var BufferReader = require('../utils/reader');
 var BufferWriter = require('../utils/writer');
 var global = bcoin.utils.global;

lib/bcoin/mempool/mempool.js

@@ -14,7 +14,7 @@
 
 var bcoin = require('../env');
 var AsyncObject = require('../utils/async');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var BufferWriter = require('../utils/writer');

lib/bcoin/miner/minerblock.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var bn = require('bn.js');
 var EventEmitter = require('events').EventEmitter;
 var BufferReader = require('../utils/reader');

lib/bcoin/net/bip150.js

@@ -12,7 +12,7 @@ var EventEmitter = require('events').EventEmitter;
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 
 var ZERO_SIG = new Buffer(64);
 ZERO_SIG.fill(0);

lib/bcoin/net/bip151.js

@@ -16,7 +16,7 @@ var EventEmitter = require('events').EventEmitter;
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var chachapoly = require('../crypto/chachapoly');
 
 /*

lib/bcoin/net/bip152.js

@@ -9,7 +9,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var siphash = require('../crypto/siphash');
 var AbstractBlock = bcoin.abstractblock;
 

lib/bcoin/net/peer.js

@@ -14,7 +14,7 @@ var IP = require('../utils/ip');
 var Parser = require('./parser');
 var Framer = require('./framer');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var InvItem = bcoin.packets.InvItem;
 var VersionPacket = bcoin.packets.VersionPacket;
 var GetBlocksPacket = bcoin.packets.GetBlocksPacket;

lib/bcoin/net/pool.js

@@ -13,7 +13,7 @@ var EventEmitter = require('events').EventEmitter;
 var utils = require('../utils/utils');
 var IP = require('../utils/ip');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var VerifyError = bcoin.errors.VerifyError;
 var NetworkAddress = bcoin.packets.NetworkAddress;
 var InvItem = bcoin.packets.InvItem;

lib/bcoin/node/fullnode.js

@@ -8,7 +8,7 @@
 'use strict';
 
 var bcoin = require('../env');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var Node = bcoin.node;

lib/bcoin/primitives/abstractblock.js

@@ -8,7 +8,7 @@
 'use strict';
 
 var bcoin = require('../env');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = bcoin.utils;
 var assert = utils.assert;
 var InvItem = bcoin.packets.InvItem;

lib/bcoin/primitives/address.js

@@ -8,8 +8,8 @@
 'use strict';
 
 var bcoin = require('../env');
-var networks = bcoin.protocol.networks;
-var constants = bcoin.protocol.constants;
+var networks = bcoin.networks;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var BufferWriter = require('../utils/writer');

lib/bcoin/primitives/block.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var AbstractBlock = bcoin.abstractblock;
 
 /**

lib/bcoin/primitives/coin.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var utils = require('../utils/utils');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var assert = utils.assert;
 var Output = bcoin.output;
 

lib/bcoin/primitives/hd.js

@@ -82,8 +82,8 @@ 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.networks;
+var constants = bcoin.constants;
+var networks = bcoin.networks;
 var KeyRing = bcoin.keyring;
 var LRU = require('../utils/lru');
 var BufferWriter = require('../utils/writer');

lib/bcoin/primitives/input.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 
 /**
  * Represents a COutPoint.

lib/bcoin/primitives/keyring.js

@@ -8,10 +8,10 @@
 'use strict';
 
 var bcoin = require('../env');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = bcoin.utils;
 var assert = utils.assert;
-var networks = bcoin.protocol.networks;
+var networks = bcoin.networks;
 var BufferReader = require('../utils/reader');
 var BufferWriter = require('../utils/writer');
 var scriptTypes = constants.scriptTypes;

lib/bcoin/primitives/merkleblock.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var DUMMY = new Buffer([0]);
 var AbstractBlock = bcoin.abstractblock;
 

lib/bcoin/primitives/mtx.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var Script = bcoin.script;
 var opcodes = constants.opcodes;
 var FundingError = bcoin.errors.FundingError;

lib/bcoin/primitives/output.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var utils = require('../utils/utils');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var assert = utils.assert;
 
 /**

lib/bcoin/primitives/script.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var bn = require('bn.js');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var BufferWriter = require('../utils/writer');

lib/bcoin/primitives/tx.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var Script = bcoin.script;
 var Stack = bcoin.stack;
 var BufferWriter = require('../utils/writer');

lib/bcoin/protocol/index.js

@@ -1,12 +0,0 @@
-/*!
- * protocol/index.js - bitcoin protocol for bcoin
- * Copyright (c) 2014-2015, Fedor Indutny (MIT License)
- * Copyright (c) 2014-2016, Christopher Jeffrey (MIT License).
- * https://github.com/bcoin-org/bcoin
- */
-
-'use strict';
-
-exports.constants = require('./constants');
-exports.networks = require('./networks');
-exports.network = require('./network');

lib/bcoin/utils/errors.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 
 /**
  * An error thrown during verification. Can be either

lib/bcoin/wallet/txdb.js

@@ -10,7 +10,7 @@
 var bcoin = require('../env');
 var utils = require('../utils/utils');
 var assert = bcoin.utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var DUMMY = new Buffer([0]);
 var BufferReader = require('../utils/reader');
 var BufferWriter = require('../utils/writer');

lib/bcoin/wallet/wallet.js

@@ -9,7 +9,7 @@
 
 var bcoin = require('../env');
 var EventEmitter = require('events').EventEmitter;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = require('../utils/utils');
 var assert = utils.assert;
 var BufferReader = require('../utils/reader');

lib/bcoin/wallet/walletdb.js

@@ -11,7 +11,7 @@ var bcoin = require('../env');
 var AsyncObject = require('../utils/async');
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var BufferReader = require('../utils/reader');
 var BufferWriter = require('../utils/writer');
 var TXDB = require('./txdb');

package.json

@@ -51,11 +51,13 @@
     "uglify-js": "2.7.0"
   },
   "browser": {
-    "./lib/bcoin/http/request": "./browser/empty.js",
-    "./lib/bcoin/http/client": "./browser/empty.js",
-    "./lib/bcoin/http/wallet": "./browser/empty.js",
     "./lib/bcoin/http/base": "./browser/empty.js",
+    "./lib/bcoin/http/client": "./browser/empty.js",
+    "./lib/bcoin/http/request": "./browser/empty.js",
+    "./lib/bcoin/http/rpcclient": "./browser/empty.js",
+    "./lib/bcoin/http/rpc": "./browser/empty.js",
     "./lib/bcoin/http/server": "./browser/empty.js",
+    "./lib/bcoin/http/wallet": "./browser/empty.js",
     "fs": "./browser/empty.js",
     "crypto": "./browser/empty.js",
     "child_process": "./browser/empty.js",

test/bip150-test.js

@@ -3,8 +3,8 @@
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
-var network = bcoin.protocol.network;
+var constants = bcoin.constants;
+var network = bcoin.networks;
 var assert = require('assert');
 
 describe('BIP150', function() {

test/bip151-test.js

@@ -3,8 +3,8 @@
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
-var network = bcoin.protocol.network;
+var constants = bcoin.constants;
+var network = bcoin.networks;
 var assert = require('assert');
 
 describe('BIP151', function() {

test/bip70-test.js

@@ -3,11 +3,11 @@
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
-var network = bcoin.protocol.network;
+var constants = bcoin.constants;
+var network = bcoin.networks;
 var assert = require('assert');
 var tests = require('./data/bip70.json');
-var bip70 = require('../lib/bcoin/bip70');
+var bip70 = require('../lib/bcoin/bip70/bip70');
 var x509 = require('../lib/bcoin/bip70/x509');
 
 tests.valid = new Buffer(tests.valid, 'hex');

test/block-test.js

@@ -3,8 +3,8 @@
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
-var network = bcoin.protocol.network;
+var constants = bcoin.constants;
+var network = bcoin.networks;
 var assert = require('assert');
 var block300025 = require('./data/block300025.json');
 var fs = require('fs');
@@ -12,7 +12,6 @@ var cmpct = fs.readFileSync(__dirname + '/data/compactblock.hex', 'utf8').trim()
 var bip152 = require('../lib/bcoin/net/bip152');
 
 describe('Block', function() {
-  var parser = bcoin.protocol.parser;
   var mblock = bcoin.merkleblock({
     version: 2,
     prevBlock: 'd1831d4411bdfda89d9d8c842b541beafd1437fc560dbe5c0000000000000000',

test/bloom-test.js

@@ -2,7 +2,7 @@
 
 var bcoin = require('../').set('main');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var assert = require('assert');
 
 describe('Bloom', function() {

test/chain-test.js

@@ -2,7 +2,7 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('regtest');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = bcoin.utils;
 var assert = require('assert');
 var opcodes = constants.opcodes;

test/http-test.js

@@ -2,8 +2,8 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('regtest');
-var constants = bcoin.protocol.constants;
-var network = bcoin.protocol.network;
+var constants = bcoin.constants;
+var network = bcoin.networks;
 var utils = bcoin.utils;
 var assert = require('assert');
 var scriptTypes = constants.scriptTypes;

test/mempool-test.js

@@ -2,7 +2,7 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var utils = bcoin.utils;
 var assert = require('assert');
 var opcodes = constants.opcodes;

test/protocol-test.js

@@ -2,7 +2,7 @@
 
 var bcoin = require('../').set('main');
 var assert = require('assert');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var network = bcoin.network.get();
 var utils = bcoin.utils;
 var fs = require('fs');

test/script-test.js

@@ -5,8 +5,8 @@ var assert = require('assert');
 var Script = bcoin.script;
 var Stack = bcoin.stack;
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
-var opcodes = bcoin.protocol.constants.opcodes;
+var constants = bcoin.constants;
+var opcodes = bcoin.constants.opcodes;
 var scripts = require('./data/script_tests');
 var bn = require('bn.js');
 

test/tx-test.js

@@ -4,8 +4,8 @@ var bn = require('bn.js');
 var bcoin = require('../').set('main');
 var assert = require('assert');
 var utils = bcoin.utils;
-var constants = bcoin.protocol.constants;
-var opcodes = bcoin.protocol.constants.opcodes;
+var constants = bcoin.constants;
+var opcodes = bcoin.constants.opcodes;
 var valid = require('./data/tx_valid.json');
 var invalid = require('./data/tx_invalid.json');
 var sighash = require('./data/sighash.json');
@@ -69,7 +69,6 @@ function clearCache(tx, nocache) {
 }
 
 describe('TX', function() {
-  var parser = bcoin.protocol.parser;
   var raw = '010000000125393c67cd4f581456dd0805fa8e9db3abdf90dbe1d4b53e28' +
             '6490f35d22b6f2010000006b483045022100f4fa5ced20d2dbd2f905809d' +
             '79ebe34e03496ef2a48a04d0a9a1db436a211dd202203243d086398feb4a' +

test/wallet-test.js

@@ -2,8 +2,8 @@
 
 var bn = require('bn.js');
 var bcoin = require('../').set('main');
-var constants = bcoin.protocol.constants;
-var network = bcoin.protocol.network;
+var constants = bcoin.constants;
+var network = bcoin.networks;
 var utils = bcoin.utils;
 var assert = require('assert');
 var scriptTypes = constants.scriptTypes;
@@ -98,10 +98,10 @@ describe('Wallet', function() {
   });
 
   function p2pkh(witness, bullshitNesting, cb) {
-    var flags = bcoin.protocol.constants.flags.STANDARD_VERIFY_FLAGS;
+    var flags = bcoin.constants.flags.STANDARD_VERIFY_FLAGS;
 
     if (witness)
-      flags |= bcoin.protocol.constants.flags.VERIFY_WITNESS;
+      flags |= bcoin.constants.flags.VERIFY_WITNESS;
 
     walletdb.create({ witness: witness }, function(err, w) {
       assert.ifError(err);
@@ -571,10 +571,10 @@ describe('Wallet', function() {
   });
 
   function multisig(witness, bullshitNesting, cb) {
-    var flags = bcoin.protocol.constants.flags.STANDARD_VERIFY_FLAGS;
+    var flags = bcoin.constants.flags.STANDARD_VERIFY_FLAGS;
 
     if (witness)
-      flags |= bcoin.protocol.constants.flags.VERIFY_WITNESS;
+      flags |= bcoin.constants.flags.VERIFY_WITNESS;
 
     // Create 3 2-of-3 wallets with our pubkeys as "shared keys"
     var options = {