RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: minor fixes.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-12-17 00:13:51 -08:00
parent 1365d0ff1d
commit dcfc19408f
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/blockchain/chain.js
View File

@ -1725,7 +1725,7 @@ Chain.prototype.hasPending = function hasPending(hash) {
* @returns {Promise} - Returns {@link ChainEntry}. * @returns {Promise} - Returns {@link ChainEntry}.
*/ */
Chain.prototype.getEntry = function getEntry(hash, callback) { Chain.prototype.getEntry = function getEntry(hash) {
return this.db.getEntry(hash); return this.db.getEntry(hash);
}; };
@ -2017,13 +2017,11 @@ Chain.prototype.retarget = function retarget(prev, first) {
*/ */
Chain.prototype.findLocator = co(function* findLocator(locator) { Chain.prototype.findLocator = co(function* findLocator(locator) {
var i, hash, main; var i, hash;
for (i = 0; i < locator.length; i++) { for (i = 0; i < locator.length; i++) {
hash = locator[i]; hash = locator[i];
main = yield this.db.isMainChain(hash); if (yield this.db.isMainChain(hash))
if (main)
return hash; return hash;
} }
@ -2033,7 +2031,7 @@ Chain.prototype.findLocator = co(function* findLocator(locator) {
/** /**
* Check whether a versionbits deployment is active (BIP9: versionbits). * Check whether a versionbits deployment is active (BIP9: versionbits).
* @example * @example
* chain.isActive(entry, 'witness', callback); * yield chain.isActive(tip, deployments.segwit);
* @see https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki * @see https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki
* @param {ChainEntry} prev - Previous chain entry. * @param {ChainEntry} prev - Previous chain entry.
* @param {String} id - Deployment id. * @param {String} id - Deployment id.
@ -2056,7 +2054,7 @@ Chain.prototype.isActive = co(function* isActive(prev, deployment) {
/** /**
* Get chain entry state for a deployment (BIP9: versionbits). * Get chain entry state for a deployment (BIP9: versionbits).
* @example * @example
* chain.getState(entry, 'witness', callback); * yield chain.getState(tip, deployments.segwit);
* @see https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki * @see https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki
* @param {ChainEntry} prev - Previous chain entry. * @param {ChainEntry} prev - Previous chain entry.
* @param {String} id - Deployment id. * @param {String} id - Deployment id.

13
lib/net/packets.js
View File

@ -1952,10 +1952,15 @@ RejectPacket.prototype.fromReader = function fromReader(br) {
this.code = br.readU8(); this.code = br.readU8();
this.reason = br.readVarString('ascii', 111); this.reason = br.readVarString('ascii', 111);
if (this.message === 'block' || this.message === 'tx') switch (this.message) {
this.hash = br.readHash('hex'); case 'block':
else case 'tx':
this.hash = null; this.hash = br.readHash('hex');
break;
default:
this.hash = null;
break;
}
return this; return this;
}; };

10
lib/node/fullnode.js
View File

@ -307,8 +307,8 @@ FullNode.prototype.scan = function scan(start, filter, iter) {
* @returns {Promise} * @returns {Promise}
*/ */
FullNode.prototype.broadcast = function broadcast(item, callback) { FullNode.prototype.broadcast = function broadcast(item) {
return this.pool.broadcast(item, callback); return this.pool.broadcast(item);
}; };
/** /**
@ -334,10 +334,8 @@ FullNode.prototype.sendTX = co(function* sendTX(tx) {
throw err; throw err;
} }
if (!this.options.selfish) if (this.options.selfish)
tx = tx.toInv(); this.pool.announceTX(tx);
yield this.pool.broadcast(tx);
}); });
/** /**