From e04dccb0c163de17d5d4a4f774324dbeea90338b Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Wed, 24 Aug 2016 01:32:56 -0700 Subject: [PATCH] refactor: more restructuring (again). --- bench/chacha.js | 2 +- bench/coin.js | 2 +- bench/tx.js | 2 +- bench/walletdb.js | 2 +- lib/bcoin/bip70/{index.js => bip70.js} | 0 lib/bcoin/chain/chain.js | 2 +- lib/bcoin/chain/chaindb.js | 2 +- lib/bcoin/chain/chainentry.js | 2 +- lib/bcoin/chain/coins.js | 2 +- lib/bcoin/env.js | 10 ++++------ lib/bcoin/http/rpc.js | 2 +- lib/bcoin/http/server.js | 2 +- lib/bcoin/mempool/fees.js | 2 +- lib/bcoin/mempool/mempool.js | 2 +- lib/bcoin/miner/minerblock.js | 2 +- lib/bcoin/net/bip150.js | 2 +- lib/bcoin/net/bip151.js | 2 +- lib/bcoin/net/bip152.js | 2 +- lib/bcoin/net/peer.js | 2 +- lib/bcoin/net/pool.js | 2 +- lib/bcoin/node/fullnode.js | 2 +- lib/bcoin/primitives/abstractblock.js | 2 +- lib/bcoin/primitives/address.js | 4 ++-- lib/bcoin/primitives/block.js | 2 +- lib/bcoin/primitives/coin.js | 2 +- lib/bcoin/primitives/hd.js | 4 ++-- lib/bcoin/primitives/input.js | 2 +- lib/bcoin/primitives/keyring.js | 4 ++-- lib/bcoin/primitives/merkleblock.js | 2 +- lib/bcoin/primitives/mtx.js | 2 +- lib/bcoin/primitives/output.js | 2 +- lib/bcoin/primitives/script.js | 2 +- lib/bcoin/primitives/tx.js | 2 +- lib/bcoin/protocol/index.js | 12 ------------ lib/bcoin/utils/errors.js | 2 +- lib/bcoin/wallet/txdb.js | 2 +- lib/bcoin/wallet/wallet.js | 2 +- lib/bcoin/wallet/walletdb.js | 2 +- package.json | 8 +++++--- test/bip150-test.js | 4 ++-- test/bip151-test.js | 4 ++-- test/bip70-test.js | 6 +++--- test/block-test.js | 5 ++--- test/bloom-test.js | 2 +- test/chain-test.js | 2 +- test/http-test.js | 4 ++-- test/mempool-test.js | 2 +- test/protocol-test.js | 2 +- test/script-test.js | 4 ++-- test/tx-test.js | 5 ++--- test/wallet-test.js | 12 ++++++------ 51 files changed, 72 insertions(+), 86 deletions(-) rename lib/bcoin/bip70/{index.js => bip70.js} (100%) delete mode 100644 lib/bcoin/protocol/index.js diff --git a/bench/chacha.js b/bench/chacha.js index 376a3fe4..e450f687 100644 --- a/bench/chacha.js +++ b/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'); diff --git a/bench/coin.js b/bench/coin.js index 6790740e..19606931 100644 --- a/bench/coin.js +++ b/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'); diff --git a/bench/tx.js b/bench/tx.js index b614069e..52ac8056 100644 --- a/bench/tx.js +++ b/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'); diff --git a/bench/walletdb.js b/bench/walletdb.js index 0440b8ff..c38efbe0 100644 --- a/bench/walletdb.js +++ b/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'); diff --git a/lib/bcoin/bip70/index.js b/lib/bcoin/bip70/bip70.js similarity index 100% rename from lib/bcoin/bip70/index.js rename to lib/bcoin/bip70/bip70.js diff --git a/lib/bcoin/chain/chain.js b/lib/bcoin/chain/chain.js index 8f18f9ce..b5cf09c6 100644 --- a/lib/bcoin/chain/chain.js +++ b/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; diff --git a/lib/bcoin/chain/chaindb.js b/lib/bcoin/chain/chaindb.js index 9275c5c6..4bec6169 100644 --- a/lib/bcoin/chain/chaindb.js +++ b/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]); diff --git a/lib/bcoin/chain/chainentry.js b/lib/bcoin/chain/chainentry.js index 29cfb3e7..51b3aa05 100644 --- a/lib/bcoin/chain/chainentry.js +++ b/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'); diff --git a/lib/bcoin/chain/coins.js b/lib/bcoin/chain/coins.js index f877263d..dbd15d4d 100644 --- a/lib/bcoin/chain/coins.js +++ b/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'); diff --git a/lib/bcoin/env.js b/lib/bcoin/env.js index b796fbc3..68eba83a 100644 --- a/lib/bcoin/env.js +++ b/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'); diff --git a/lib/bcoin/http/rpc.js b/lib/bcoin/http/rpc.js index 7e081feb..fb913b8f 100644 --- a/lib/bcoin/http/rpc.js +++ b/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 { diff --git a/lib/bcoin/http/server.js b/lib/bcoin/http/server.js index d73f6b3e..60ae66b1 100644 --- a/lib/bcoin/http/server.js +++ b/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'); diff --git a/lib/bcoin/mempool/fees.js b/lib/bcoin/mempool/fees.js index 7e48b315..d5d2f852 100644 --- a/lib/bcoin/mempool/fees.js +++ b/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; diff --git a/lib/bcoin/mempool/mempool.js b/lib/bcoin/mempool/mempool.js index 13d627bf..741182ad 100644 --- a/lib/bcoin/mempool/mempool.js +++ b/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'); diff --git a/lib/bcoin/miner/minerblock.js b/lib/bcoin/miner/minerblock.js index 45a72a61..82cb2ea9 100644 --- a/lib/bcoin/miner/minerblock.js +++ b/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'); diff --git a/lib/bcoin/net/bip150.js b/lib/bcoin/net/bip150.js index a55833e0..4a1f5131 100644 --- a/lib/bcoin/net/bip150.js +++ b/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); diff --git a/lib/bcoin/net/bip151.js b/lib/bcoin/net/bip151.js index dcc226e4..4d3568f2 100644 --- a/lib/bcoin/net/bip151.js +++ b/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'); /* diff --git a/lib/bcoin/net/bip152.js b/lib/bcoin/net/bip152.js index 809ec3ff..a11d8c62 100644 --- a/lib/bcoin/net/bip152.js +++ b/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; diff --git a/lib/bcoin/net/peer.js b/lib/bcoin/net/peer.js index d669fcf7..6b4d978e 100644 --- a/lib/bcoin/net/peer.js +++ b/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; diff --git a/lib/bcoin/net/pool.js b/lib/bcoin/net/pool.js index 50bcf522..63e90741 100644 --- a/lib/bcoin/net/pool.js +++ b/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; diff --git a/lib/bcoin/node/fullnode.js b/lib/bcoin/node/fullnode.js index 06752f2c..bad512a5 100644 --- a/lib/bcoin/node/fullnode.js +++ b/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; diff --git a/lib/bcoin/primitives/abstractblock.js b/lib/bcoin/primitives/abstractblock.js index f387ff20..da16c396 100644 --- a/lib/bcoin/primitives/abstractblock.js +++ b/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; diff --git a/lib/bcoin/primitives/address.js b/lib/bcoin/primitives/address.js index 28c89a0e..10767d80 100644 --- a/lib/bcoin/primitives/address.js +++ b/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'); diff --git a/lib/bcoin/primitives/block.js b/lib/bcoin/primitives/block.js index 1792b426..5062bfe2 100644 --- a/lib/bcoin/primitives/block.js +++ b/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; /** diff --git a/lib/bcoin/primitives/coin.js b/lib/bcoin/primitives/coin.js index daf5b340..92bf2ffe 100644 --- a/lib/bcoin/primitives/coin.js +++ b/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; diff --git a/lib/bcoin/primitives/hd.js b/lib/bcoin/primitives/hd.js index b746f200..6c45695b 100644 --- a/lib/bcoin/primitives/hd.js +++ b/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'); diff --git a/lib/bcoin/primitives/input.js b/lib/bcoin/primitives/input.js index ee226167..ca872d89 100644 --- a/lib/bcoin/primitives/input.js +++ b/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. diff --git a/lib/bcoin/primitives/keyring.js b/lib/bcoin/primitives/keyring.js index a773f786..6cbbfb62 100644 --- a/lib/bcoin/primitives/keyring.js +++ b/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; diff --git a/lib/bcoin/primitives/merkleblock.js b/lib/bcoin/primitives/merkleblock.js index bc83d4b9..f3854bbf 100644 --- a/lib/bcoin/primitives/merkleblock.js +++ b/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; diff --git a/lib/bcoin/primitives/mtx.js b/lib/bcoin/primitives/mtx.js index 28e9973a..676bfca3 100644 --- a/lib/bcoin/primitives/mtx.js +++ b/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; diff --git a/lib/bcoin/primitives/output.js b/lib/bcoin/primitives/output.js index 0e2e35ce..3d15e8ed 100644 --- a/lib/bcoin/primitives/output.js +++ b/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; /** diff --git a/lib/bcoin/primitives/script.js b/lib/bcoin/primitives/script.js index c6f176c0..24ccd962 100644 --- a/lib/bcoin/primitives/script.js +++ b/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'); diff --git a/lib/bcoin/primitives/tx.js b/lib/bcoin/primitives/tx.js index 194bcee8..4bc6a630 100644 --- a/lib/bcoin/primitives/tx.js +++ b/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'); diff --git a/lib/bcoin/protocol/index.js b/lib/bcoin/protocol/index.js deleted file mode 100644 index 9c9c491a..00000000 --- a/lib/bcoin/protocol/index.js +++ /dev/null @@ -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'); diff --git a/lib/bcoin/utils/errors.js b/lib/bcoin/utils/errors.js index 356a34ef..9f553ba7 100644 --- a/lib/bcoin/utils/errors.js +++ b/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 diff --git a/lib/bcoin/wallet/txdb.js b/lib/bcoin/wallet/txdb.js index 52fdafce..24c6d8d5 100644 --- a/lib/bcoin/wallet/txdb.js +++ b/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'); diff --git a/lib/bcoin/wallet/wallet.js b/lib/bcoin/wallet/wallet.js index 6cc2ca4f..a5d48b52 100644 --- a/lib/bcoin/wallet/wallet.js +++ b/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'); diff --git a/lib/bcoin/wallet/walletdb.js b/lib/bcoin/wallet/walletdb.js index 13d98e0e..bfb4eaa2 100644 --- a/lib/bcoin/wallet/walletdb.js +++ b/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'); diff --git a/package.json b/package.json index 431a1a14..f52e2393 100644 --- a/package.json +++ b/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", diff --git a/test/bip150-test.js b/test/bip150-test.js index f25eebda..d2124259 100644 --- a/test/bip150-test.js +++ b/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() { diff --git a/test/bip151-test.js b/test/bip151-test.js index 0505c06c..dbda5ac0 100644 --- a/test/bip151-test.js +++ b/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() { diff --git a/test/bip70-test.js b/test/bip70-test.js index 796ad27f..5a3ba71f 100644 --- a/test/bip70-test.js +++ b/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'); diff --git a/test/block-test.js b/test/block-test.js index f6ba7fdc..ac8ebd71 100644 --- a/test/block-test.js +++ b/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', diff --git a/test/bloom-test.js b/test/bloom-test.js index efb019c7..0a3eb179 100644 --- a/test/bloom-test.js +++ b/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() { diff --git a/test/chain-test.js b/test/chain-test.js index f57212db..9d765704 100644 --- a/test/chain-test.js +++ b/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; diff --git a/test/http-test.js b/test/http-test.js index 3fec8a30..c3904a6f 100644 --- a/test/http-test.js +++ b/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; diff --git a/test/mempool-test.js b/test/mempool-test.js index 24d0174c..c3a9ce86 100644 --- a/test/mempool-test.js +++ b/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; diff --git a/test/protocol-test.js b/test/protocol-test.js index b6819d36..5bfcacc0 100644 --- a/test/protocol-test.js +++ b/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'); diff --git a/test/script-test.js b/test/script-test.js index 8cc70efd..b0e0d93b 100644 --- a/test/script-test.js +++ b/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'); diff --git a/test/tx-test.js b/test/tx-test.js index 1bcc537c..f38d1603 100644 --- a/test/tx-test.js +++ b/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' + diff --git a/test/wallet-test.js b/test/wallet-test.js index 09e04e50..1a49ed28 100644 --- a/test/wallet-test.js +++ b/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 = {