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

minor: lint.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-03-14 00:35:50 -07:00
parent 68bba8621e
commit 9e479483f5
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/http/rpc.js
View File

@ -1056,7 +1056,7 @@ RPC.prototype._submitBlock = co(function* _submitBlock(block) {
});
RPC.prototype.__submitBlock = co(function* __submitBlock(block) {
var entry, prev, state;
var entry, prev, state, tx;
this.logger.info('Handling submitted block: %s.', block.rhash());
@ -2501,7 +2501,7 @@ RPC.prototype.blockToJSON = co(function* blockToJSON(entry, block, details) {
RPC.prototype.entryToJSON = function entryToJSON(entry) {
return {
size: entry.size,
fee: Amount.btc(entry.fee, true),
fee: Amount.btc(entry.deltaFee, true),
modifiedfee: 0,
time: entry.ts,
height: entry.height,

10
lib/mempool/mempool.js
View File

@ -1961,15 +1961,19 @@ Mempool.prototype.getSize = function getSize() {
*/
Mempool.prototype.prioritise = function _prioritise(entry, pri, fee) {
if (-pri > entry.priority)
pri = -entry.priority;
entry.priority += pri;
if (-fee > entry.deltaFee)
fee = -entry.deltaFee;
if (-pri < entry.priority)
pri = -entry.priority;
if (fee === 0)
return;
this.updateAncestors(entry, preprioritise);
entry.priority += pri;
entry.deltaFee += fee;
entry.descFee += fee;

4
lib/mempool/mempoolentry.js
View File

@ -163,8 +163,8 @@ MempoolEntry.prototype.txid = function txid() {
*/
MempoolEntry.prototype.getPriority = function getPriority(height) {
var height = height - this.height;
var priority = (height * this.value) / this.size;
var delta = height - this.height;
var priority = (delta * this.value) / this.size;
var result = this.priority + Math.floor(priority);
if (result < 0)
result = 0;

10
lib/node/logger.js
View File

@ -545,7 +545,7 @@ Logger.prototype.context = function context(module) {
Logger.prototype.writeConsole = function writeConsole(level, module, args) {
var name = Logger.prefixByVal[level];
var msg = '';
var fmt, color, ch;
var color, ch;
assert(name, 'Invalid log level.');
@ -576,15 +576,15 @@ Logger.prototype.writeConsole = function writeConsole(level, module, args) {
assert(color);
msg += '\x1b[' + color + 'm';
msg += '[' + name + '] ';
msg += '\x1b[m';
msg += '[' + name + ']';
msg += '\x1b[m ';
if (module) {
ch = module.charCodeAt(0) + module.length;
color = Logger.colors[ch % Logger.colors.length];
msg += '\x1b[' + color + 'm';
msg += '(' + module + ') ';
msg += '\x1b[m';
msg += '(' + module + ')';
msg += '\x1b[m ';
}
} else {
msg += '[' + name + '] ';