spawn: rename to co.
This commit is contained in:
parent
1213782b3e
commit
1a8657d131
@ -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();
|
||||
|
||||
|
||||
3
bin/cli
3
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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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');
|
||||
|
||||
/**
|
||||
|
||||
@ -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();
|
||||
});
|
||||
|
||||
/**
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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();
|
||||
});
|
||||
|
||||
/**
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -310,7 +310,7 @@ if (typeof window !== 'undefined') {
|
||||
* Expose
|
||||
*/
|
||||
|
||||
exports = spawn;
|
||||
exports = co;
|
||||
exports.exec = exec;
|
||||
exports.spawn = spawn;
|
||||
exports.co = co;
|
||||
@ -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');
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user