From 1a8657d13110f3d60de44d69b1af13fa42925b09 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sun, 2 Oct 2016 02:43:50 -0700 Subject: [PATCH] spawn: rename to co. --- bench/walletdb.js | 2 +- bin/cli | 3 +-- lib/chain/chain.js | 7 +++---- lib/chain/chaindb.js | 3 +-- lib/chain/chainentry.js | 5 ++--- lib/crypto/crypto.js | 8 +++----- lib/db/lowlevelup.js | 28 +++++++++++++--------------- lib/env.js | 4 ++-- lib/http/client.js | 3 +-- lib/http/rpc.js | 7 +++---- lib/http/rpcclient.js | 3 +-- lib/http/server.js | 7 +++---- lib/http/wallet.js | 3 +-- lib/mempool/mempool.js | 5 ++--- lib/miner/miner.js | 3 +-- lib/miner/minerblock.js | 3 +-- lib/net/bip150.js | 4 ++-- lib/net/bip151.js | 4 ++-- lib/net/bip152.js | 4 ++-- lib/net/peer.js | 7 +++---- lib/net/pool.js | 13 ++++++------- lib/node/fullnode.js | 3 +-- lib/node/node.js | 3 +-- lib/node/spvnode.js | 3 +-- lib/utils/async.js | 12 +++++------- lib/utils/{spawn.js => co.js} | 2 +- lib/wallet/account.js | 3 +-- lib/wallet/txdb.js | 3 +-- lib/wallet/wallet.js | 3 +-- lib/wallet/walletdb.js | 3 +-- lib/workers/workers.js | 5 ++--- migrate/chaindb0to1.js | 5 ++--- test/chain-test.js | 12 +++++------- test/http-test.js | 6 +++--- test/mempool-test.js | 3 +-- test/wallet-test.js | 6 ++---- 36 files changed, 82 insertions(+), 116 deletions(-) rename lib/utils/{spawn.js => co.js} (99%) diff --git a/bench/walletdb.js b/bench/walletdb.js index b0646e0e..3c12f035 100644 --- a/bench/walletdb.js +++ b/bench/walletdb.js @@ -7,7 +7,7 @@ var utils = bcoin.utils; var assert = require('assert'); var scriptTypes = constants.scriptTypes; var bench = require('./bench'); -var co = require('../lib/utils/spawn').co; +var co = require('../lib/utils/co'); bcoin.cache(); diff --git a/bin/cli b/bin/cli index ba565443..01b65a80 100755 --- a/bin/cli +++ b/bin/cli @@ -4,10 +4,9 @@ var config = require('../lib/node/config'); var utils = require('../lib/utils/utils'); -var spawn = require('../lib/utils/spawn'); +var co = require('../lib/utils/co'); var Client = require('../lib/http/client'); var Wallet = require('../lib/http/wallet'); -var co = spawn.co; var assert = require('assert'); var main; diff --git a/lib/chain/chain.js b/lib/chain/chain.js index 0a22c4e4..5fd07c10 100644 --- a/lib/chain/chain.js +++ b/lib/chain/chain.js @@ -19,8 +19,7 @@ var assert = require('assert'); var VerifyError = require('../utils/errors').VerifyError; var VerifyResult = utils.VerifyResult; var time = require('../net/timedata'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); /** * Represents a blockchain. @@ -682,7 +681,7 @@ Chain.prototype.checkInputs = co(function* checkInputs(block, prev, state) { return view; // Verify all txs in parallel. - valid = yield spawn.every(jobs); + valid = yield co.every(jobs); if (!valid) { throw new VerifyError(block, @@ -1225,7 +1224,7 @@ Chain.prototype._add = co(function* add(block) { if (this.orphan.size > this.orphanLimit) this.pruneOrphans(); - yield spawn.wait(); + yield co.wait(); if (!this.synced && this.isFull()) { this.synced = true; diff --git a/lib/chain/chaindb.js b/lib/chain/chaindb.js index f5af5ea2..1290f8ce 100644 --- a/lib/chain/chaindb.js +++ b/lib/chain/chaindb.js @@ -14,7 +14,7 @@ var assert = require('assert'); var DUMMY = new Buffer([0]); var BufferWriter = require('../utils/writer'); var BufferReader = require('../utils/reader'); -var spawn = require('../utils/spawn'); +var co = require('../utils/co'); var CoinView = require('./coinview'); var Coins = require('./coins'); var ldb = require('../db/ldb'); @@ -24,7 +24,6 @@ var Coin = require('../primitives/coin'); var TX = require('../primitives/tx'); var Address = require('../primitives/address'); var ChainEntry = require('./chainentry'); -var co = spawn.co; /* * Database Layout: diff --git a/lib/chain/chainentry.js b/lib/chain/chainentry.js index 905c0ab3..a0216749 100644 --- a/lib/chain/chainentry.js +++ b/lib/chain/chainentry.js @@ -17,8 +17,7 @@ var BufferWriter = require('../utils/writer'); var BufferReader = require('../utils/reader'); var Headers = require('../primitives/headers'); var InvItem = require('../primitives/invitem'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); /** * Represents an entry in the chain. Unlike @@ -237,7 +236,7 @@ ChainEntry.prototype.getAncestorByHeight = co(function* getAncestorByHeight(heig var main, entry; if (height < 0) - return yield spawn.wait(); + return yield co.wait(); assert(height >= 0); assert(height <= this.height); diff --git a/lib/crypto/crypto.js b/lib/crypto/crypto.js index 4146a6db..fece8222 100644 --- a/lib/crypto/crypto.js +++ b/lib/crypto/crypto.js @@ -12,9 +12,7 @@ var random = require('./random'); var scrypt = require('./scrypt'); var scryptAsync = require('./scrypt-async'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; -var wrap = spawn.wrap; +var co = require('../utils/co'); var native = require('../utils/native'); var lazy = require('../utils/lazy')(require, exports); var nodeCrypto, hash, aes; @@ -189,7 +187,7 @@ crypto.pbkdf2Async = function pbkdf2Async(key, salt, iter, len, alg) { if (nodeCrypto && nodeCrypto.pbkdf2) { return new Promise(function(resolve, reject) { - nodeCrypto.pbkdf2(key, salt, iter, len, alg, wrap(resolve, reject)); + nodeCrypto.pbkdf2(key, salt, iter, len, alg, co.wrap(resolve, reject)); }); } @@ -242,7 +240,7 @@ crypto.scryptAsync = function _scrypt(passwd, salt, N, r, p, len) { salt = new Buffer(salt, 'utf8'); return new Promise(function(resolve, reject) { - scryptAsync(passwd, salt, N, r, p, len, wrap(resolve, reject)); + scryptAsync(passwd, salt, N, r, p, len, co.wrap(resolve, reject)); }); }; diff --git a/lib/db/lowlevelup.js b/lib/db/lowlevelup.js index cd94d65a..0626f947 100644 --- a/lib/db/lowlevelup.js +++ b/lib/db/lowlevelup.js @@ -10,9 +10,7 @@ var utils = require('../utils/utils'); var assert = require('assert'); var AsyncObject = require('../utils/async'); -var spawn = require('../utils/spawn'); -var co = spawn.co; -var wrap = spawn.wrap; +var co = require('../utils/co'); var VERSION_ERROR; /** @@ -66,7 +64,7 @@ utils.inherits(LowlevelUp, AsyncObject); LowlevelUp.prototype._open = function open() { var self = this; return new Promise(function(resolve, reject) { - self.binding.open(self.options, wrap(resolve, reject)); + self.binding.open(self.options, co.wrap(resolve, reject)); }); }; @@ -79,7 +77,7 @@ LowlevelUp.prototype._open = function open() { LowlevelUp.prototype._close = function close() { var self = this; return new Promise(function(resolve, reject) { - self.binding.close(wrap(resolve, reject)); + self.binding.close(co.wrap(resolve, reject)); }); }; @@ -98,7 +96,7 @@ LowlevelUp.prototype.destroy = function destroy() { return new Promise(function(resolve, reject) { if (!self.backend.destroy) return reject(new Error('Cannot destroy.')); - self.backend.destroy(self.location, wrap(resolve, reject)); + self.backend.destroy(self.location, co.wrap(resolve, reject)); }); }; @@ -117,7 +115,7 @@ LowlevelUp.prototype.repair = function repair() { return new Promise(function(resolve, reject) { if (!self.backend.repair) return reject(new Error('Cannot repair.')); - self.backend.repair(self.location, wrap(resolve, reject)); + self.backend.repair(self.location, co.wrap(resolve, reject)); }); }; @@ -138,7 +136,7 @@ LowlevelUp.prototype.backup = function backup(path) { return this.clone(path); return new Promise(function(resolve, reject) { - self.binding.backup(path, wrap(resolve, reject)); + self.binding.backup(path, co.wrap(resolve, reject)); }); }; @@ -176,7 +174,7 @@ LowlevelUp.prototype.put = function put(key, value) { var self = this; assert(this.loaded, 'Cannot use database before it is loaded.'); return new Promise(function(resolve, reject) { - self.binding.put(key, value, wrap(resolve, reject)); + self.binding.put(key, value, co.wrap(resolve, reject)); }); }; @@ -190,7 +188,7 @@ LowlevelUp.prototype.del = function del(key) { var self = this; assert(this.loaded, 'Cannot use database before it is loaded.'); return new Promise(function(resolve, reject) { - self.binding.del(key, wrap(resolve, reject)); + self.binding.del(key, co.wrap(resolve, reject)); }); }; @@ -209,7 +207,7 @@ LowlevelUp.prototype.batch = function batch(ops) { return new Batch(this); return new Promise(function(resolve, reject) { - self.binding.batch(ops, wrap(resolve, reject)); + self.binding.batch(ops, co.wrap(resolve, reject)); }); }; @@ -280,7 +278,7 @@ LowlevelUp.prototype.approximateSize = function approximateSize(start, end) { if (!self.binding.approximateSize) return reject(new Error('Cannot get size.')); - self.binding.approximateSize(start, end, wrap(resolve, reject)); + self.binding.approximateSize(start, end, co.wrap(resolve, reject)); }); }; @@ -560,7 +558,7 @@ Batch.prototype.del = function del(key) { Batch.prototype.write = function write() { var self = this; return new Promise(function(resolve, reject) { - self.batch.write(wrap(resolve, reject)); + self.batch.write(co.wrap(resolve, reject)); }); }; @@ -601,7 +599,7 @@ Iterator.prototype.next = function() { } if (key === undefined && value === undefined) { - self.iter.end(wrap(resolve, reject)); + self.iter.end(co.wrap(resolve, reject)); return; } @@ -627,7 +625,7 @@ Iterator.prototype.seek = function seek(key) { Iterator.prototype.end = function end() { var self = this; return new Promise(function(resolve, reject) { - self.iter.end(wrap(resolve, reject)); + self.iter.end(co.wrap(resolve, reject)); }); }; diff --git a/lib/env.js b/lib/env.js index e870c553..40efb72f 100644 --- a/lib/env.js +++ b/lib/env.js @@ -123,7 +123,7 @@ function Environment() { this.require('bloom', './utils/bloom'); this.require('uri', './utils/uri'); this.require('errors', './utils/errors'); - this.require('spawn', './utils/spawn'); + this.require('co', './utils/co'); // Crypto this.require('ec', './crypto/ec'); @@ -272,7 +272,7 @@ Environment.prototype.cache = function cache() { require('./utils/bloom'); require('./utils/uri'); require('./utils/errors'); - require('./utils/spawn'); + require('./utils/co'); require('./crypto/ec'); require('./crypto/crypto'); require('./crypto/chachapoly'); diff --git a/lib/http/client.js b/lib/http/client.js index fe53a944..49568050 100644 --- a/lib/http/client.js +++ b/lib/http/client.js @@ -11,8 +11,7 @@ var Network = require('../protocol/network'); var AsyncObject = require('../utils/async'); var RPCClient = require('./rpcclient'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var request = require('./request').promise; diff --git a/lib/http/rpc.js b/lib/http/rpc.js index f06c5454..3b43cb78 100644 --- a/lib/http/rpc.js +++ b/lib/http/rpc.js @@ -7,8 +7,7 @@ 'use strict'; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var crypto = require('../crypto/crypto'); var assert = require('assert'); var constants = require('../protocol/constants'); @@ -4158,13 +4157,13 @@ function reverseEndian(data) { function writeFile(file, data) { return new Promise(function(resolve, reject) { - fs.writeFile(file, data, spawn.wrap(resolve, reject)); + fs.writeFile(file, data, co.wrap(resolve, reject)); }); } function readFile(file, enc) { return new Promise(function(resolve, reject) { - fs.readFile(file, enc, spawn.wrap(resolve, reject)); + fs.readFile(file, enc, co.wrap(resolve, reject)); }); } diff --git a/lib/http/rpcclient.js b/lib/http/rpcclient.js index 922ad19e..16fa6222 100644 --- a/lib/http/rpcclient.js +++ b/lib/http/rpcclient.js @@ -8,8 +8,7 @@ var Network = require('../protocol/network'); var request = require('./request'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); /** * BCoin RPC client. diff --git a/lib/http/server.js b/lib/http/server.js index 16dce34b..b4445b4c 100644 --- a/lib/http/server.js +++ b/lib/http/server.js @@ -13,15 +13,14 @@ var EventEmitter = require('events').EventEmitter; var constants = require('../protocol/constants'); var HTTPBase = require('./base'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); +var co = require('../utils/co'); var Address = require('../primitives/address'); var TX = require('../primitives/tx'); var Script = require('../script/script'); -var co = spawn.co; -var con = spawn.con; var crypto = require('../crypto/crypto'); var assert = require('assert'); -var RPC; /*= require('./rpc'); - load lazily */ +var con = co.con; +var RPC; /** * HTTPServer diff --git a/lib/http/wallet.js b/lib/http/wallet.js index 5270bd3e..8aad9cfa 100644 --- a/lib/http/wallet.js +++ b/lib/http/wallet.js @@ -11,8 +11,7 @@ var Network = require('../protocol/network'); var EventEmitter = require('events').EventEmitter; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var Client = require('./client'); /** diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index d25167b6..1cb58a7e 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -9,8 +9,7 @@ var AsyncObject = require('../utils/async'); var constants = require('../protocol/constants'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var crypto = require('../crypto/crypto'); var VerifyError = require('../utils/errors').VerifyError; @@ -200,7 +199,7 @@ Mempool.prototype._addBlock = co(function* addBlock(block) { // There may be a locktime in a TX that is now valid. this.rejects.reset(); - yield spawn.wait(); + yield co.wait(); }); /** diff --git a/lib/miner/miner.js b/lib/miner/miner.js index b8878fbd..682f6e46 100644 --- a/lib/miner/miner.js +++ b/lib/miner/miner.js @@ -8,8 +8,7 @@ 'use strict'; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var AsyncObject = require('../utils/async'); var MinerBlock = require('./minerblock'); diff --git a/lib/miner/minerblock.js b/lib/miner/minerblock.js index 846c009d..6f6edaf3 100644 --- a/lib/miner/minerblock.js +++ b/lib/miner/minerblock.js @@ -8,8 +8,7 @@ 'use strict'; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var crypto = require('../crypto/crypto'); var assert = require('assert'); var constants = require('../protocol/constants'); diff --git a/lib/net/bip150.js b/lib/net/bip150.js index 75987fc7..20d664f5 100644 --- a/lib/net/bip150.js +++ b/lib/net/bip150.js @@ -10,7 +10,7 @@ var EventEmitter = require('events').EventEmitter; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); +var co = require('../utils/co'); var crypto = require('../crypto/crypto'); var packets = require('./packets'); var assert = require('assert'); @@ -252,7 +252,7 @@ BIP150.prototype.complete = function complete(err) { BIP150.prototype.wait = function wait(timeout) { var self = this; return new Promise(function(resolve, reject) { - self._wait(timeout, spawn.wrap(resolve, reject)); + self._wait(timeout, co.wrap(resolve, reject)); }); }; diff --git a/lib/net/bip151.js b/lib/net/bip151.js index 4bad33d2..21d2827b 100644 --- a/lib/net/bip151.js +++ b/lib/net/bip151.js @@ -14,7 +14,7 @@ var EventEmitter = require('events').EventEmitter; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); +var co = require('../utils/co'); var crypto = require('../crypto/crypto'); var assert = require('assert'); var constants = require('../protocol/constants'); @@ -461,7 +461,7 @@ BIP151.prototype.complete = function complete(err) { BIP151.prototype.wait = function wait(timeout) { var self = this; return new Promise(function(resolve, reject) { - self._wait(timeout, spawn.wrap(resolve, reject)); + self._wait(timeout, co.wrap(resolve, reject)); }); }; diff --git a/lib/net/bip152.js b/lib/net/bip152.js index 67161c30..6d3b9f53 100644 --- a/lib/net/bip152.js +++ b/lib/net/bip152.js @@ -9,7 +9,7 @@ var utils = require('../utils/utils'); var BufferReader = require('../utils/reader'); var BufferWriter = require('../utils/writer'); -var spawn = require('../utils/spawn'); +var co = require('../utils/co'); var crypto = require('../crypto/crypto'); var assert = require('assert'); var constants = require('../protocol/constants'); @@ -370,7 +370,7 @@ CompactBlock.fromBlock = function fromBlock(block, nonce) { CompactBlock.prototype.wait = function wait(time) { var self = this; return new Promise(function(resolve, reject) { - self._wait(time, spawn.wrap(resolve, reject)); + self._wait(time, co.wrap(resolve, reject)); }); }; diff --git a/lib/net/peer.js b/lib/net/peer.js index fc3c6fe6..0c8a8421 100644 --- a/lib/net/peer.js +++ b/lib/net/peer.js @@ -9,8 +9,7 @@ var EventEmitter = require('events').EventEmitter; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var Parser = require('./parser'); var Framer = require('./framer'); var packets = require('./packets'); @@ -306,7 +305,7 @@ Peer.prototype._connect = function _connect() { if (this.connected) { assert(!this.outbound); - return spawn.wait(); + return co.wait(); } return new Promise(function(resolve, reject) { @@ -476,7 +475,7 @@ Peer.prototype._finalize = co(function* _finalize() { // Start syncing the chain. this.sync(); - yield spawn.wait(); + yield co.wait(); }); /** diff --git a/lib/net/pool.js b/lib/net/pool.js index e5f6ba26..9a10d96e 100644 --- a/lib/net/pool.js +++ b/lib/net/pool.js @@ -11,8 +11,7 @@ var AsyncObject = require('../utils/async'); var EventEmitter = require('events').EventEmitter; var utils = require('../utils/utils'); var IP = require('../utils/ip'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var constants = require('../protocol/constants'); var VerifyError = require('../utils/errors').VerifyError; @@ -430,7 +429,7 @@ Pool.prototype.listen = function listen() { }); return new Promise(function(resolve, reject) { - self.server.listen(self.port, '0.0.0.0', spawn.wrap(resolve, reject)); + self.server.listen(self.port, '0.0.0.0', co.wrap(resolve, reject)); }); }; @@ -449,7 +448,7 @@ Pool.prototype.unlisten = function unlisten() { return; return new Promise(function(resolve, reject) { - self.server.close(spawn.wrap(resolve, reject)); + self.server.close(co.wrap(resolve, reject)); self.server = null; }); }; @@ -927,7 +926,7 @@ Pool.prototype._handleBlock = co(function* _handleBlock(block, peer) { this.logger.warning( 'Received unrequested block: %s (%s).', block.rhash, peer.hostname); - return yield spawn.wait(); + return yield co.wait(); } try { @@ -1651,7 +1650,7 @@ Pool.prototype.scheduleRequests = co(function* scheduleRequests(peer) { this.scheduled = true; yield this.chain.onDrain(); - yield spawn.wait(); + yield co.wait(); this.sendRequests(peer); this.scheduled = false; @@ -1745,7 +1744,7 @@ Pool.prototype.broadcast = function broadcast(msg) { } return new Promise(function(resolve, reject) { - item.addCallback(spawn.wrap(resolve, reject)); + item.addCallback(co.wrap(resolve, reject)); }); }; diff --git a/lib/node/fullnode.js b/lib/node/fullnode.js index d03e0592..e1a60e59 100644 --- a/lib/node/fullnode.js +++ b/lib/node/fullnode.js @@ -9,8 +9,7 @@ var constants = require('../protocol/constants'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var Node = require('./node'); var Chain = require('../chain/chain'); var Fees = require('../mempool/fees'); diff --git a/lib/node/node.js b/lib/node/node.js index 6ae7de82..6c6174e5 100644 --- a/lib/node/node.js +++ b/lib/node/node.js @@ -9,8 +9,7 @@ var AsyncObject = require('../utils/async'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var Network = require('../protocol/network'); var Logger = require('./logger'); diff --git a/lib/node/spvnode.js b/lib/node/spvnode.js index 2bdcf056..11e0d46e 100644 --- a/lib/node/spvnode.js +++ b/lib/node/spvnode.js @@ -8,8 +8,7 @@ 'use strict'; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var Node = require('./node'); var Chain = require('../chain/chain'); var Pool = require('../net/pool'); diff --git a/lib/utils/async.js b/lib/utils/async.js index fa9ac425..b7967f30 100644 --- a/lib/utils/async.js +++ b/lib/utils/async.js @@ -7,10 +7,8 @@ 'use strict'; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); -var wait = spawn.wait; var EventEmitter = require('events').EventEmitter; /** @@ -60,7 +58,7 @@ AsyncObject.prototype.open = co(function* open() { assert(!this.closing, 'Cannot open while closing.'); if (this.loaded) - return yield wait(); + return yield co.wait(); if (this.loading) return yield this._onOpen(); @@ -78,7 +76,7 @@ AsyncObject.prototype.open = co(function* open() { err = e; } - yield wait(); + yield co.wait(); if (err) { this.loading = false; @@ -107,7 +105,7 @@ AsyncObject.prototype.close = co(function* close() { assert(!this.loading, 'Cannot close while loading.'); if (!this.loaded) - return yield wait(); + return yield co.wait(); if (this.closing) return yield this._onClose(); @@ -126,7 +124,7 @@ AsyncObject.prototype.close = co(function* close() { err = e; } - yield wait(); + yield co.wait(); if (err) { this.closing = false; diff --git a/lib/utils/spawn.js b/lib/utils/co.js similarity index 99% rename from lib/utils/spawn.js rename to lib/utils/co.js index 6050988c..8b24a1a0 100644 --- a/lib/utils/spawn.js +++ b/lib/utils/co.js @@ -310,7 +310,7 @@ if (typeof window !== 'undefined') { * Expose */ -exports = spawn; +exports = co; exports.exec = exec; exports.spawn = spawn; exports.co = co; diff --git a/lib/wallet/account.js b/lib/wallet/account.js index 7ad63462..3d2ea482 100644 --- a/lib/wallet/account.js +++ b/lib/wallet/account.js @@ -8,8 +8,7 @@ var Network = require('../protocol/network'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var BufferReader = require('../utils/reader'); var BufferWriter = require('../utils/writer'); diff --git a/lib/wallet/txdb.js b/lib/wallet/txdb.js index d7c20b28..ea9a512c 100644 --- a/lib/wallet/txdb.js +++ b/lib/wallet/txdb.js @@ -10,8 +10,7 @@ var utils = require('../utils/utils'); var Locker = require('../utils/locker'); var LRU = require('../utils/lru'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var assert = require('assert'); var constants = require('../protocol/constants'); var BufferReader = require('../utils/reader'); diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js index 471c9dc4..bbaa98fd 100644 --- a/lib/wallet/wallet.js +++ b/lib/wallet/wallet.js @@ -12,8 +12,7 @@ var constants = require('../protocol/constants'); var Network = require('../protocol/network'); var utils = require('../utils/utils'); var Locker = require('../utils/locker'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var crypto = require('../crypto/crypto'); var assert = require('assert'); var BufferReader = require('../utils/reader'); diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js index 9ce31447..5fe559ad 100644 --- a/lib/wallet/walletdb.js +++ b/lib/wallet/walletdb.js @@ -9,10 +9,9 @@ var AsyncObject = require('../utils/async'); var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); +var co = require('../utils/co'); var Locker = require('../utils/locker'); var LRU = require('../utils/lru'); -var co = spawn.co; var crypto = require('../crypto/crypto'); var assert = require('assert'); var constants = require('../protocol/constants'); diff --git a/lib/workers/workers.js b/lib/workers/workers.js index 9ae6a197..05c1974a 100644 --- a/lib/workers/workers.js +++ b/lib/workers/workers.js @@ -11,8 +11,7 @@ module.exports = Workers; var EventEmitter = require('events').EventEmitter; var utils = require('../utils/utils'); -var spawn = require('../utils/spawn'); -var co = spawn.co; +var co = require('../utils/co'); var global = utils.global; var Network = require('../protocol/network'); var jobs = require('./jobs'); @@ -642,7 +641,7 @@ Worker.prototype._execute = function _execute(method, args, timeout, callback) { Worker.prototype.execute = function execute(method, args, timeout) { var self = this; return new Promise(function(resolve, reject) { - self._execute(method, args, timeout, spawn.wrap(resolve, reject)); + self._execute(method, args, timeout, co.wrap(resolve, reject)); }); }; diff --git a/migrate/chaindb0to1.js b/migrate/chaindb0to1.js index 7c8ac41b..2e21332b 100644 --- a/migrate/chaindb0to1.js +++ b/migrate/chaindb0to1.js @@ -1,6 +1,5 @@ var bcoin = require('../'); -var spawn = bcoin.spawn; -var co = spawn.co; +var co = bcoin.co; var assert = require('assert'); var file = process.argv[2]; @@ -104,7 +103,7 @@ var updateEndian = co(function* updateEndian() { console.log('Migrated endianness.'); }); -spawn(function *() { +co.spawn(function *() { yield db.open(); console.log('Opened %s.', file); yield checkVersion(); diff --git a/test/chain-test.js b/test/chain-test.js index fb7d8fae..db3097b2 100644 --- a/test/chain-test.js +++ b/test/chain-test.js @@ -7,10 +7,8 @@ var utils = bcoin.utils; var crypto = require('../lib/crypto/crypto'); var assert = require('assert'); var opcodes = constants.opcodes; -var spawn = require('../lib/utils/spawn'); -var co = require('../lib/utils/spawn').co; -var cob = require('../lib/utils/spawn').cob; -var c = require('../lib/utils/spawn').cb; +var co = require('../lib/utils/co'); +var cob = co.cob; describe('Chain', function() { var chain, wallet, node, miner, walletdb; @@ -119,7 +117,7 @@ describe('Chain', function() { it('should have correct balance', cob(function* () { var balance; - yield spawn.timeout(100); + yield co.timeout(100); balance = yield wallet.getBalance(); assert.equal(balance.unconfirmed, 0); @@ -157,7 +155,7 @@ describe('Chain', function() { it('should have correct balance', cob(function *() { var balance; - yield spawn.timeout(100); + yield co.timeout(100); balance = yield wallet.getBalance(); assert.equal(balance.unconfirmed, 500 * 1e8); @@ -220,7 +218,7 @@ describe('Chain', function() { it('should get balance', cob(function *() { var balance, txs; - yield spawn.timeout(100); + yield co.timeout(100); balance = yield wallet.getBalance(); assert.equal(balance.unconfirmed, 500 * 1e8); diff --git a/test/http-test.js b/test/http-test.js index eb93d97c..1fed6bae 100644 --- a/test/http-test.js +++ b/test/http-test.js @@ -8,8 +8,8 @@ var utils = bcoin.utils; var crypto = require('../lib/crypto/crypto'); var assert = require('assert'); var scriptTypes = constants.scriptTypes; -var spawn = require('../lib/utils/spawn'); -var cob = spawn.cob; +var co = require('../lib/utils/co'); +var cob = co.cob; var dummyInput = { prevout: { @@ -101,7 +101,7 @@ describe('HTTP', function() { }); yield node.walletdb.addTX(t1); - yield spawn.timeout(300); + yield co.timeout(300); assert(receive); assert.equal(receive.id, 'test'); diff --git a/test/mempool-test.js b/test/mempool-test.js index 60fbe549..c67c59d1 100644 --- a/test/mempool-test.js +++ b/test/mempool-test.js @@ -7,8 +7,7 @@ var utils = bcoin.utils; var crypto = require('../lib/crypto/crypto'); var assert = require('assert'); var opcodes = constants.opcodes; -var c = require('../lib/utils/spawn').cb; -var cob = require('../lib/utils/spawn').cob; +var cob = require('../lib/utils/co').cob; function dummy(prev, prevHash) { if (!prevHash) diff --git a/test/wallet-test.js b/test/wallet-test.js index af101b1b..2d7fde29 100644 --- a/test/wallet-test.js +++ b/test/wallet-test.js @@ -6,12 +6,10 @@ var constants = bcoin.constants; var network = bcoin.networks; var utils = bcoin.utils; var crypto = require('../lib/crypto/crypto'); -var spawn = require('../lib/utils/spawn'); var assert = require('assert'); var scriptTypes = constants.scriptTypes; -var c = require('../lib/utils/spawn').cb; -var co = require('../lib/utils/spawn').co; -var cob = require('../lib/utils/spawn').cob; +var co = require('../lib/utils/co'); +var cob = co.cob; var KEY1 = 'xprv9s21ZrQH143K3Aj6xQBymM31Zb4BVc7wxqfUhMZrzewdDVCt' + 'qUP9iWfcHgJofs25xbaUpCps9GDXj83NiWvQCAkWQhVj5J4CorfnpKX94AZ';