diff --git a/src/js/ripple/server.js b/src/js/ripple/server.js index 389f6c22..127d6037 100644 --- a/src/js/ripple/server.js +++ b/src/js/ripple/server.js @@ -694,7 +694,7 @@ Server.prototype._computeFee = function(transaction) { var units; if (transaction instanceof Transaction) { - units = transaction.feeUnits(); + units = transaction._getFeeUnits(); } else if (typeof transaction === 'number') { units = transaction; } else { diff --git a/src/js/ripple/transaction.js b/src/js/ripple/transaction.js index d857ffeb..58b498a0 100644 --- a/src/js/ripple/transaction.js +++ b/src/js/ripple/transaction.js @@ -925,13 +925,6 @@ Transaction.prototype.abort = function(callback) { } }; -Transaction.prototype.iff = function(fn) { - var self = this; - this._iff = function(callback) { - fn(self.summary(), callback); - }; -}; - Transaction.prototype.summary = function() { return Transaction.summary.call(this); }; diff --git a/src/js/ripple/transactionmanager.js b/src/js/ripple/transactionmanager.js index a4bfdef6..ecb29f3f 100644 --- a/src/js/ripple/transactionmanager.js +++ b/src/js/ripple/transactionmanager.js @@ -509,17 +509,7 @@ TransactionManager.prototype._request = function(tx) { submitRequest.server = tx._server; } - if (typeof tx._iff === 'function') { - tx._iff(function(err, proceed) { - if (err || !proceed) { - tx.emit('abort'); - } else { - submitTransaction(); - } - }); - } else { - submitTransaction(); - } + submitTransaction(); }; function requestTimeout() {