From bf4f5e3bacbda1466d8ece6c5b003394e109d73e Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 16 Nov 2017 10:41:19 -0800 Subject: [PATCH] bcoin: bstring requires. --- lib/hd/private.js | 2 +- lib/hd/public.js | 2 +- lib/net/bip150.js | 2 +- lib/node/http.js | 4 ++-- lib/node/rpc.js | 2 +- lib/primitives/keyring.js | 2 +- lib/wallet/http.js | 4 ++-- lib/wallet/rpc.js | 2 +- lib/wallet/wallet.js | 2 +- test/hd-test.js | 6 +++--- test/utils-test.js | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/hd/private.js b/lib/hd/private.js index 979d37c2..f2a94fce 100644 --- a/lib/hd/private.js +++ b/lib/hd/private.js @@ -7,6 +7,7 @@ 'use strict'; const assert = require('assert'); +const {base58} = require('bstring'); const sha512 = require('bcrypto/lib/sha512'); const hash160 = require('bcrypto/lib/hash160'); const hash256 = require('bcrypto/lib/hash256'); @@ -16,7 +17,6 @@ const secp256k1 = require('bcrypto/lib/secp256k1'); const StaticWriter = require('bufio/lib/staticwriter'); const BufferReader = require('bufio/lib/reader'); const encoding = require('bufio/lib/encoding'); -const base58 = require('bstring/lib/base58'); const Network = require('../protocol/network'); const common = require('./common'); const Mnemonic = require('./mnemonic'); diff --git a/lib/hd/public.js b/lib/hd/public.js index f783db41..5135ab06 100644 --- a/lib/hd/public.js +++ b/lib/hd/public.js @@ -7,6 +7,7 @@ 'use strict'; const assert = require('assert'); +const {base58} = require('bstring'); const sha512 = require('bcrypto/lib/sha512'); const hash160 = require('bcrypto/lib/hash160'); const hash256 = require('bcrypto/lib/hash256'); @@ -15,7 +16,6 @@ const secp256k1 = require('bcrypto/lib/secp256k1'); const Network = require('../protocol/network'); const StaticWriter = require('bufio/lib/staticwriter'); const BufferReader = require('bufio/lib/reader'); -const base58 = require('bstring/lib/base58'); const encoding = require('bufio/lib/encoding'); const common = require('./common'); diff --git a/lib/net/bip150.js b/lib/net/bip150.js index addc859a..88cbc48c 100644 --- a/lib/net/bip150.js +++ b/lib/net/bip150.js @@ -15,6 +15,7 @@ const fs = require('bfile'); const dns = require('bdns'); const IP = require('binet'); const Logger = require('blgr'); +const {base58} = require('bstring'); const ccmp = require('bcrypto/lib/ccmp'); const hash160 = require('bcrypto/lib/hash160'); const hash256 = require('bcrypto/lib/hash256'); @@ -22,7 +23,6 @@ const random = require('bcrypto/lib/random'); const secp256k1 = require('bcrypto/lib/secp256k1'); const StaticWriter = require('bufio/lib/staticwriter'); const encoding = require('bufio/lib/encoding'); -const base58 = require('bstring/lib/base58'); const packets = require('./packets'); /** diff --git a/lib/node/http.js b/lib/node/http.js index 7530e315..7af6a153 100644 --- a/lib/node/http.js +++ b/lib/node/http.js @@ -10,13 +10,13 @@ const assert = require('assert'); const path = require('path'); const {Server} = require('bweb'); +const Validator = require('bval'); +const {base58} = require('bstring'); const sha256 = require('bcrypto/lib/sha256'); const random = require('bcrypto/lib/random'); const ccmp = require('bcrypto/lib/ccmp'); const encoding = require('bufio/lib/encoding'); -const base58 = require('bstring/lib/base58'); const BloomFilter = require('bfilter/lib/bloom'); -const Validator = require('bval/lib/validator'); const util = require('../utils/util'); const TX = require('../primitives/tx'); const Outpoint = require('../primitives/outpoint'); diff --git a/lib/node/rpc.js b/lib/node/rpc.js index c96e1d86..eb25506c 100644 --- a/lib/node/rpc.js +++ b/lib/node/rpc.js @@ -10,12 +10,12 @@ const assert = require('assert'); const bweb = require('bweb'); const {Lock} = require('bmutex'); const IP = require('binet'); +const Validator = require('bval'); const hash160 = require('bcrypto/lib/hash160'); const hash256 = require('bcrypto/lib/hash256'); const ccmp = require('bcrypto/lib/ccmp'); const secp256k1 = require('bcrypto/lib/secp256k1'); const encoding = require('bufio/lib/encoding'); -const Validator = require('bval/lib/validator'); const util = require('../utils/util'); const common = require('../blockchain/common'); const Amount = require('../btc/amount'); diff --git a/lib/primitives/keyring.js b/lib/primitives/keyring.js index dd342c0b..673fbee8 100644 --- a/lib/primitives/keyring.js +++ b/lib/primitives/keyring.js @@ -8,13 +8,13 @@ 'use strict'; const assert = require('assert'); +const {base58} = require('bstring'); const encoding = require('bufio/lib/encoding'); const hash160 = require('bcrypto/lib/hash160'); const hash256 = require('bcrypto/lib/hash256'); const Network = require('../protocol/network'); const BufferReader = require('bufio/lib/reader'); const StaticWriter = require('bufio/lib/staticwriter'); -const base58 = require('bstring/lib/base58'); const Script = require('../script/script'); const Address = require('./address'); const Output = require('./output'); diff --git a/lib/wallet/http.js b/lib/wallet/http.js index baf9bfb9..2286e151 100644 --- a/lib/wallet/http.js +++ b/lib/wallet/http.js @@ -10,7 +10,8 @@ const assert = require('assert'); const path = require('path'); const {Server} = require('bweb'); -const base58 = require('bstring/lib/base58'); +const Validator = require('bval'); +const {base58} = require('bstring'); const MTX = require('../primitives/mtx'); const Outpoint = require('../primitives/outpoint'); const Script = require('../script/script'); @@ -18,7 +19,6 @@ const sha256 = require('bcrypto/lib/sha256'); const random = require('bcrypto/lib/random'); const ccmp = require('bcrypto/lib/ccmp'); const Network = require('../protocol/network'); -const Validator = require('bval/lib/validator'); const Address = require('../primitives/address'); const KeyRing = require('../primitives/keyring'); const Mnemonic = require('../hd/mnemonic'); diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js index 228fe570..d986da98 100644 --- a/lib/wallet/rpc.js +++ b/lib/wallet/rpc.js @@ -11,9 +11,9 @@ const {format} = require('util'); const bweb = require('bweb'); const {Lock} = require('bmutex'); const fs = require('bfile'); +const Validator = require('bval'); const hash256 = require('bcrypto/lib/hash256'); const encoding = require('bufio/lib/encoding'); -const Validator = require('bval/lib/validator'); const util = require('../utils/util'); const Amount = require('../btc/amount'); const Script = require('../script/script'); diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js index cfb1e903..2756e15f 100644 --- a/lib/wallet/wallet.js +++ b/lib/wallet/wallet.js @@ -10,13 +10,13 @@ const assert = require('assert'); const EventEmitter = require('events'); const {Lock} = require('bmutex'); +const {base58} = require('bstring'); const encoding = require('bufio/lib/encoding'); const hash160 = require('bcrypto/lib/hash160'); const hash256 = require('bcrypto/lib/hash256'); const cleanse = require('bcrypto/lib/cleanse'); const BufferReader = require('bufio/lib/reader'); const StaticWriter = require('bufio/lib/staticwriter'); -const base58 = require('bstring/lib/base58'); const Network = require('../protocol/network'); const TXDB = require('./txdb'); const Path = require('./path'); diff --git a/test/hd-test.js b/test/hd-test.js index b42282d9..72c4bbaf 100644 --- a/test/hd-test.js +++ b/test/hd-test.js @@ -3,11 +3,11 @@ 'use strict'; -const assert = require('./util/assert'); -const HD = require('../lib/hd'); -const base58 = require('bstring/lib/base58'); +const {base58} = require('bstring'); const pbkdf2 = require('bcrypto/lib/pbkdf2'); const sha512 = require('bcrypto/lib/sha512'); +const assert = require('./util/assert'); +const HD = require('../lib/hd'); const vectors = require('./data/hd.json'); const vector1 = vectors.vector1; const vector2 = vectors.vector2; diff --git a/test/utils-test.js b/test/utils-test.js index c8b96c6a..bf6fcc21 100644 --- a/test/utils-test.js +++ b/test/utils-test.js @@ -3,12 +3,12 @@ 'use strict'; -const assert = require('./util/assert'); const {U64, I64} = require('n64'); -const base58 = require('bstring/lib/base58'); +const Validator = require('bval'); +const {base58} = require('bstring'); const encoding = require('bufio/lib/encoding'); +const assert = require('./util/assert'); const Amount = require('../lib/btc/amount'); -const Validator = require('bval/lib/validator'); const fixed = require('../lib/utils/fixed'); const base58Tests = [