ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-20 12:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove server._computeFee(Transaction), require fee units argument

Browse Source
This commit is contained in:
wltsmrz
2014-11-11 06:24:34 -08:00
parent b0cac776ee
commit 8f17873da2
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/ripple/server.js
View File

@@ -2,7 +2,6 @@ var util = require('util');
var url = require('url'); var url = require('url');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var Amount = require('./amount').Amount; var Amount = require('./amount').Amount;
var Transaction = require('./transaction').Transaction;
var log = require('./log').internal.sub('server'); var log = require('./log').internal.sub('server');
/** /**
@@ -760,22 +759,16 @@ Server.prototype._isConnected = function() {
* Calculate transaction fee * Calculate transaction fee
* *
* @param {Transaction|Number} Fee units for a provided transaction * @param {Transaction|Number} Fee units for a provided transaction
* @return {Number} Final fee in XRP for specified number of fee units * @return {String} Final fee in XRP for specified number of fee units
* @api private * @api private
*/ */
Server.prototype._computeFee = function(transaction) { Server.prototype._computeFee = function(feeUnits) {
var units; if (isNaN(feeUnits)) {
if (transaction instanceof Transaction) {
units = transaction._getFeeUnits();
} else if (typeof transaction === 'number') {
units = transaction;
} else {
throw new Error('Invalid argument'); throw new Error('Invalid argument');
} }
return this._feeTx(units).to_json(); return this._feeTx(Number(feeUnits)).to_json();
}; };
/** /**

2
src/js/ripple/transaction.js
View File

@@ -276,7 +276,7 @@ Transaction.prototype._computeFee = function() {
for (var i=0; i<servers.length; i++) { for (var i=0; i<servers.length; i++) {
var server = servers[i]; var server = servers[i];
if (server._connected) { if (server._connected) {
fees.push(Number(server._computeFee(this))); fees.push(Number(server._computeFee(this._getFeeUnits())));
} }
} }

8
test/server-test.js
View File

@@ -1006,12 +1006,6 @@ describe('Server', function() {
assert(server._isConnected()); assert(server._isConnected());
}); });
it('Compute fee - transaction', function() {
var server = new Server(new Remote(), 'ws://localhost:5748');
var transaction = new Transaction();
assert.strictEqual(server._computeFee(transaction), '12');
});
it('Compute fee - fee units', function() { it('Compute fee - fee units', function() {
var server = new Server(new Remote(), 'ws://localhost:5748'); var server = new Server(new Remote(), 'ws://localhost:5748');
var transaction = new Transaction(); var transaction = new Transaction();
@@ -1033,7 +1027,7 @@ describe('Server', function() {
server._load_factor = 256 * 4; server._load_factor = 256 * 4;
var transaction = new Transaction(); var transaction = new Transaction();
assert.strictEqual(server._computeFee(transaction), '48'); assert.strictEqual(server._computeFee(10), '48');
}); });
it('Compute reserve', function() { it('Compute reserve', function() {