From 405feef9ceccda8f28727938e4caee6a86ea4509 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 16 Nov 2017 12:24:45 -0800 Subject: [PATCH] bcoin: clean up requires. --- lib/mempool/mempool.js | 2 +- lib/net/hostlist.js | 2 +- lib/net/packets.js | 2 +- lib/net/peer.js | 2 +- lib/net/pool.js | 3 +-- lib/node/http.js | 2 +- lib/primitives/tx.js | 5 ++--- lib/wallet/walletdb.js | 5 ++--- test/block-test.js | 2 +- test/util/memwallet.js | 2 +- 10 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index 56906417..f3eb2c80 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -11,13 +11,13 @@ const path = require('path'); const EventEmitter = require('events'); const BDB = require('bdb'); const {encoding} = require('bufio'); +const {RollingFilter} = require('bfilter'); const common = require('../blockchain/common'); const consensus = require('../protocol/consensus'); const policy = require('../protocol/policy'); const util = require('../utils/util'); const random = require('bcrypto/lib/random'); const {VerifyError} = require('../protocol/errors'); -const RollingFilter = require('bfilter/lib/rolling'); const Address = require('../primitives/address'); const Script = require('../script/script'); const Outpoint = require('../primitives/outpoint'); diff --git a/lib/net/hostlist.js b/lib/net/hostlist.js index 5c988ad7..bafe88a3 100644 --- a/lib/net/hostlist.js +++ b/lib/net/hostlist.js @@ -12,7 +12,7 @@ const fs = require('bfile'); const IP = require('binet'); const dns = require('bdns'); const Logger = require('blgr'); -const murmur3 = require('bfilter/lib/murmur3'); +const {murmur3} = require('bfilter'); const util = require('../utils/util'); const Network = require('../protocol/network'); const NetAddress = require('../primitives/netaddress'); diff --git a/lib/net/packets.js b/lib/net/packets.js index a9ecf056..d31f09af 100644 --- a/lib/net/packets.js +++ b/lib/net/packets.js @@ -13,9 +13,9 @@ const assert = require('assert'); const bio = require('bufio'); +const {BloomFilter} = require('bfilter'); const common = require('./common'); const util = require('../utils/util'); -const BloomFilter = require('bfilter/lib/bloom'); const bip152 = require('./bip152'); const NetAddress = require('../primitives/netaddress'); const Headers = require('../primitives/headers'); diff --git a/lib/net/peer.js b/lib/net/peer.js index fe4df617..b0c019bf 100644 --- a/lib/net/peer.js +++ b/lib/net/peer.js @@ -14,7 +14,7 @@ const {format} = require('util'); const tcp = require('btcp'); const Logger = require('blgr'); const {encoding} = require('bufio'); -const RollingFilter = require('bfilter/lib/rolling'); +const {RollingFilter} = require('bfilter'); const Parser = require('./parser'); const Framer = require('./framer'); const packets = require('./packets'); diff --git a/lib/net/pool.js b/lib/net/pool.js index 19985d0e..2ab9385e 100644 --- a/lib/net/pool.js +++ b/lib/net/pool.js @@ -16,8 +16,7 @@ const dns = require('bdns'); const tcp = require('btcp'); const UPNP = require('bupnp'); const socks = require('bsocks'); -const BloomFilter = require('bfilter/lib/bloom'); -const RollingFilter = require('bfilter/lib/rolling'); +const {BloomFilter, RollingFilter} = require('bfilter'); const secp256k1 = require('bcrypto/lib/secp256k1'); const util = require('../utils/util'); const common = require('./common'); diff --git a/lib/node/http.js b/lib/node/http.js index 10d37520..49c6a96b 100644 --- a/lib/node/http.js +++ b/lib/node/http.js @@ -13,10 +13,10 @@ const {Server} = require('bweb'); const Validator = require('bval'); const {base58} = require('bstring'); const {encoding} = require('bufio'); +const {BloomFilter} = require('bfilter'); const sha256 = require('bcrypto/lib/sha256'); const random = require('bcrypto/lib/random'); const ccmp = require('bcrypto/lib/ccmp'); -const BloomFilter = require('bfilter/lib/bloom'); const util = require('../utils/util'); const TX = require('../primitives/tx'); const Outpoint = require('../primitives/outpoint'); diff --git a/lib/primitives/tx.js b/lib/primitives/tx.js index ef18fa55..cce911f2 100644 --- a/lib/primitives/tx.js +++ b/lib/primitives/tx.js @@ -19,7 +19,6 @@ const Input = require('./input'); const Output = require('./output'); const Outpoint = require('./outpoint'); const InvItem = require('./invitem'); -const BloomFilter = require('bfilter/lib/bloom'); const consensus = require('../protocol/consensus'); const policy = require('../protocol/policy'); const ScriptError = require('../script/scripterror'); @@ -1973,10 +1972,10 @@ class TX { const output = this.outputs[i]; // Test the output script if (output.script.test(filter)) { - if (filter.update === BloomFilter.flags.ALL) { + if (filter.update === 1 /* ALL */) { const prevout = Outpoint.fromTX(this, i); filter.add(prevout.toRaw()); - } else if (filter.update === BloomFilter.flags.PUBKEY_ONLY) { + } else if (filter.update === 2 /* PUBKEY_ONLY */) { if (output.script.isPubkey() || output.script.isMultisig()) { const prevout = Outpoint.fromTX(this, i); filter.add(prevout.toRaw()); diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js index 89628caf..adbb5d78 100644 --- a/lib/wallet/walletdb.js +++ b/lib/wallet/walletdb.js @@ -11,13 +11,12 @@ const assert = require('assert'); const path = require('path'); const EventEmitter = require('events'); const bio = require('bufio'); -const Lock = require('bmutex/lib/lock'); -const MapLock = require('bmutex/lib/maplock'); +const {BloomFilter} = require('bfilter'); +const {Lock, MapLock} = require('bmutex'); const BDB = require('bdb'); const Logger = require('blgr'); const ccmp = require('bcrypto/lib/ccmp'); const aes = require('bcrypto/lib/aes'); -const BloomFilter = require('bfilter/lib/bloom'); const Network = require('../protocol/network'); const Path = require('./path'); const common = require('./common'); diff --git a/test/block-test.js b/test/block-test.js index 8f5e9120..40c7705c 100644 --- a/test/block-test.js +++ b/test/block-test.js @@ -5,7 +5,7 @@ const assert = require('./util/assert'); const common = require('./util/common'); -const BloomFilter = require('bfilter/lib/bloom'); +const {BloomFilter} = require('bfilter'); const Block = require('../lib/primitives/block'); const MerkleBlock = require('../lib/primitives/merkleblock'); const consensus = require('../lib/protocol/consensus'); diff --git a/test/util/memwallet.js b/test/util/memwallet.js index b69b1320..8f7365c1 100644 --- a/test/util/memwallet.js +++ b/test/util/memwallet.js @@ -10,7 +10,7 @@ const assert = require('assert'); const Network = require('../../lib/protocol/network'); const MTX = require('../../lib/primitives/mtx'); const HD = require('../../lib/hd/hd'); -const BloomFilter = require('bfilter/lib/bloom'); +const {BloomFilter} = require('bfilter'); const KeyRing = require('../../lib/primitives/keyring'); const Outpoint = require('../../lib/primitives/outpoint'); const Coin = require('../../lib/primitives/coin');